poppler: Fix rootfile.

Message ID 20220513212634.10873-1-stefan.schantl@ipfire.org
State Accepted
Commit 8533f1b1d36fcdfcd7e3d5c8b027cc90898ef635
Headers
Series poppler: Fix rootfile. |

Commit Message

Stefan Schantl May 13, 2022, 9:26 p.m. UTC
  libpoppler.so.120.0.0 contains all the functions and symbols which
are required by the tools linked against it.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
---
 config/rootfiles/common/poppler | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
  

Comments

Adolf Belka May 14, 2022, 9:12 a.m. UTC | #1
Hi Stefan and All,

You have found several of these, all from patch submissions of mine.

I have figured out what has been happening with these when I submitted them.

When the logfile in the build has changed files with a + at the start of the line I go though the file with my simple xfce based editor mousepad.

It has a find and replace function on it where I put + for the find and for the replace I left it empty and then I go one by one through the lines and if it is a library file, or other file that should be used then I replace the + with nothing.

mousepad has obviously had some changes because now it no longer allows the replace box to be empty and if I leave it empty then it takes the first entry in the history list which at that time was #. If I was doing it now then the first entry in my history is xxxMACHINExxx so that would have been added in place of the + which would have been easier to spot that I had made a mistake

Sorry for causing this problem.Unfortunately I am not sure how many I have messed up like this. I will try and have a search through my patch submission history and see if I can spot anything else.

I will look for a new simple gui text editor that will allow me to do a replace with nothing or I will have to have a look at doing it in the terminal.

Regards,

Adolf.

Reviewed-by: Adolf Belka <adolf.belka@ipfire.org>

On 13/05/2022 23:26, Stefan Schantl wrote:
> libpoppler.so.120.0.0 contains all the functions and symbols which
> are required by the tools linked against it.
>
> Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
> ---
>   config/rootfiles/common/poppler | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/config/rootfiles/common/poppler b/config/rootfiles/common/poppler
> index 0ea058043..5c6f48e00 100644
> --- a/config/rootfiles/common/poppler
> +++ b/config/rootfiles/common/poppler
> @@ -174,7 +174,7 @@ usr/lib/libpoppler-glib.so.8
>   usr/lib/libpoppler-glib.so.8.23.0
>   #usr/lib/libpoppler.so
>   usr/lib/libpoppler.so.120
> -#usr/lib/libpoppler.so.120.0.0
> +usr/lib/libpoppler.so.120.0.0
>   #usr/lib/pkgconfig/poppler-cpp.pc
>   #usr/lib/pkgconfig/poppler-glib.pc
>   #usr/lib/pkgconfig/poppler.pc
  
Adolf Belka May 14, 2022, 9:43 a.m. UTC | #2
Hi Stefan and All,

On 14/05/2022 11:12, Adolf Belka wrote:
> Hi Stefan and All,
>
> You have found several of these, all from patch submissions of mine.
>
> I have figured out what has been happening with these when I submitted them.
>
> When the logfile in the build has changed files with a + at the start of the line I go though the file with my simple xfce based editor mousepad.
>
> It has a find and replace function on it where I put + for the find and for the replace I left it empty and then I go one by one through the lines and if it is a library file, or other file that should be used then I replace the + with nothing.
>
> mousepad has obviously had some changes because now it no longer allows the replace box to be empty and if I leave it empty then it takes the first entry in the history list which at that time was #. If I was doing it now then the first entry in my history is xxxMACHINExxx so that would have been added in place of the + which would have been easier to spot that I had made a mistake
>
> Sorry for causing this problem.Unfortunately I am not sure how many I have messed up like this. I will try and have a search through my patch submission history and see if I can spot anything else.
>
I searched all the submissions that covered this period and it looks like all the ones where I added a # at the start of a needed library line have been found.

Regards,

Adolf.

> I will look for a new simple gui text editor that will allow me to do a replace with nothing or I will have to have a look at doing it in the terminal.
>
> Regards,
>
> Adolf.
>
> Reviewed-by: Adolf Belka <adolf.belka@ipfire.org>
>
> On 13/05/2022 23:26, Stefan Schantl wrote:
>> libpoppler.so.120.0.0 contains all the functions and symbols which
>> are required by the tools linked against it.
>>
>> Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
>> ---
>>   config/rootfiles/common/poppler | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/config/rootfiles/common/poppler b/config/rootfiles/common/poppler
>> index 0ea058043..5c6f48e00 100644
>> --- a/config/rootfiles/common/poppler
>> +++ b/config/rootfiles/common/poppler
>> @@ -174,7 +174,7 @@ usr/lib/libpoppler-glib.so.8
>>   usr/lib/libpoppler-glib.so.8.23.0
>>   #usr/lib/libpoppler.so
>>   usr/lib/libpoppler.so.120
>> -#usr/lib/libpoppler.so.120.0.0
>> +usr/lib/libpoppler.so.120.0.0
>>   #usr/lib/pkgconfig/poppler-cpp.pc
>>   #usr/lib/pkgconfig/poppler-glib.pc
>>   #usr/lib/pkgconfig/poppler.pc
  

Patch

diff --git a/config/rootfiles/common/poppler b/config/rootfiles/common/poppler
index 0ea058043..5c6f48e00 100644
--- a/config/rootfiles/common/poppler
+++ b/config/rootfiles/common/poppler
@@ -174,7 +174,7 @@  usr/lib/libpoppler-glib.so.8
 usr/lib/libpoppler-glib.so.8.23.0
 #usr/lib/libpoppler.so
 usr/lib/libpoppler.so.120
-#usr/lib/libpoppler.so.120.0.0
+usr/lib/libpoppler.so.120.0.0
 #usr/lib/pkgconfig/poppler-cpp.pc
 #usr/lib/pkgconfig/poppler-glib.pc
 #usr/lib/pkgconfig/poppler.pc