Attachment 11615 Details for Bug 26542 – Patch to fix link failures

[patch] Patch to fix link failures

utsushi-0.54.0-mga-fix-link-failures.patch (text/plain), 5.29 KB, created by Nicolas Salguero on 2020-04-30 22:05:16 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Nicolas Salguero

Created: 2020-04-30 22:05:16 CEST

Size: 5.29 KB

patch

obsolete

>--- utsushi-0.54.0/lib/Makefile.am	2019-03-06 03:44:11.000000000 +0100
>+++ utsushi-0.54.0/lib/Makefile.am.new	2019-04-02 15:30:02.282227641 +0200
>@@ -61,11 +61,17 @@ outputs += ../outputs/tiff.cpp
> outputs += ../outputs/tiff.hpp
> endif
> 
>+connexions  =
>+connexions += ../connexions/hexdump.cpp
>+connexions += ../connexions/usb.cpp
>+
> pkglib_LTLIBRARIES = libutsushi.la
> libutsushi_la_LIBADD   = $(LIBUTSUSHI_LIBS)
> libutsushi_la_LIBADD  += $(LIBLTDL)
> libutsushi_la_LIBADD  += $(LTLIBINTL)
> libutsushi_la_LIBADD  += $(LIBUDEV_LIBS)
>+libutsushi_la_LIBADD  += $(LIBUSB_LIBS)
>+libutsushi_la_LIBADD  += -lpthread
> libutsushi_la_SOURCES  = connexion.cpp
> libutsushi_la_SOURCES += device-info.cpp
> libutsushi_la_SOURCES += exception.cpp
>@@ -87,6 +93,8 @@ libutsushi_la_SOURCES += udev.cpp
> libutsushi_la_SOURCES += udev.hpp
> endif
> 
>+libutsushi_la_SOURCES += $(connexions)
>+
> AM_CPPFLAGS += $(LTDLINCL)
> ## FIXME: These *DIR defines should be removed.  The run-time should
> ## get all these locations from a configuration file so stuff can be
>--- utsushi-0.54.0/filters/Makefile.am	2019-03-06 03:44:11.000000000 +0100
>+++ utsushi-0.54.0/filters/Makefile.am.new	2019-04-02 15:00:27.509580940 +0200
>@@ -41,7 +41,8 @@ filterlib_LTLIBRARIES  = libflt-all.la
> libflt_all_la_CPPFLAGS  = $(AM_CPPFLAGS)
> libflt_all_la_CXXFLAGS  = $(AM_CXXFLAGS)
> libflt_all_la_LDFLAGS   = $(filter_ldflags)
>-libflt_all_la_LIBADD    =
>+libflt_all_la_LIBADD    = $(LIBUTSUSHI_LIBS)
>+libflt_all_la_LIBADD   += $(LIBLTDL)
> libflt_all_la_SOURCES   =
> libflt_all_la_SOURCES  += g3fax.cpp
> libflt_all_la_SOURCES  += g3fax.hpp
>@@ -85,10 +86,34 @@ libflt_all_la_SOURCES   += deskew.hpp
> endif				# have_libmagick_pp
> 
> libflt_all_la_CPPFLAGS  += -DPKGLIBEXECDIR="\"$(pkglibexecdir)\""
>+libflt_all_la_CPPFLAGS  += -DPKGLIBDIR="\"$(pkglibdir)\""
>+libflt_all_la_CPPFLAGS  += -DPKGDATADIR="\"$(pkgdatadir)\""
>+libflt_all_la_CPPFLAGS  += -DLOCALEDIR="\"$(localedir)\""
>+libflt_all_la_CPPFLAGS  += -DPKGSYSCONFDIR="\"$(pkgsysconfdir)\""
>+libflt_all_la_CPPFLAGS  += -DPKGCONFFILE="\"$(PACKAGE_TARNAME).conf\""
>+libflt_all_la_CPPFLAGS  += -DCOMBOCONFFILE="\"combo.conf\""
> libflt_all_la_SOURCES   += reorient.cpp
> libflt_all_la_SOURCES   += reorient.hpp
> dist_pkglibexec_SCRIPTS += get-text-orientation
> 
>+libflt_all_la_SOURCES   += ../lib/context.cpp
>+libflt_all_la_SOURCES   += ../lib/iobase.cpp
>+libflt_all_la_SOURCES   += ../lib/filter.cpp
>+libflt_all_la_SOURCES   += ../lib/octet.cpp
>+libflt_all_la_SOURCES   += ../lib/string.cpp
>+libflt_all_la_SOURCES   += ../lib/tag.cpp
>+libflt_all_la_SOURCES   += ../lib/quantity.cpp
>+libflt_all_la_SOURCES   += ../lib/range.cpp
>+libflt_all_la_SOURCES   += ../lib/key.cpp
>+libflt_all_la_SOURCES   += ../lib/option.cpp
>+libflt_all_la_SOURCES   += ../lib/descriptor.cpp
>+libflt_all_la_SOURCES   += ../lib/log.cpp
>+libflt_all_la_SOURCES   += ../lib/value.cpp
>+libflt_all_la_SOURCES   += ../lib/toggle.cpp
>+libflt_all_la_SOURCES   += ../lib/store.cpp
>+libflt_all_la_SOURCES   += ../lib/constraint.cpp
>+libflt_all_la_SOURCES   += ../lib/run-time.cpp
>+
> pdf_filter  =
> pdf_filter += pdf.cpp
> pdf_filter += pdf.hpp
> 
> AM_CXXFLAGS += $(LIBGTKMM_CFLAGS)
> AM_LDFLAGS  += $(BOOST_LDFLAGS)
>--- utsushi-0.54.0/gtkmm/Makefile.am	2019-03-06 03:44:11.000000000 +0100
>+++ utsushi-0.54.0/gtkmm/Makefile.am.new	2019-04-02 16:11:52.638004644 +0200
>@@ -28,6 +28,7 @@ gtkmmlib_LTLIBRARIES = libutsushi-gtkmm.
> libutsushi_gtkmm_la_LIBADD  = ../lib/libutsushi.la
> libutsushi_gtkmm_la_LIBADD += $(LIBGTKMM_LIBS)
> libutsushi_gtkmm_la_LIBADD += $(BOOST_THREAD_LIB)
>+libutsushi_gtkmm_la_LIBADD += $(LIBJPEG_LIBS)
> libutsushi_gtkmm_la_SOURCES  =
> libutsushi_gtkmm_la_SOURCES += action-dialog.cpp
> libutsushi_gtkmm_la_SOURCES += action-dialog.hpp
>@@ -47,6 +48,33 @@ libutsushi_gtkmm_la_SOURCES += preview.c
> libutsushi_gtkmm_la_SOURCES += preview.hpp
> libutsushi_gtkmm_la_SOURCES += pump.cpp
> libutsushi_gtkmm_la_SOURCES += pump.hpp
>+libutsushi_gtkmm_la_SOURCES += ../filters/image-skip.cpp
>+libutsushi_gtkmm_la_SOURCES += ../filters/jpeg.cpp
>+libutsushi_gtkmm_la_SOURCES += ../filters/magick.cpp
>+libutsushi_gtkmm_la_SOURCES += ../filters/autocrop.cpp
>+libutsushi_gtkmm_la_SOURCES += ../filters/deskew.cpp
>+libutsushi_gtkmm_la_SOURCES += ../filters/padding.cpp
>+libutsushi_gtkmm_la_SOURCES += ../filters/reorient.cpp
>+libutsushi_gtkmm_la_SOURCES += ../filters/shell-pipe.cpp
>+libutsushi_gtkmm_la_SOURCES += ../filters/pnm.cpp
>+libutsushi_gtkmm_la_SOURCES += ../filters/pdf.cpp
>+libutsushi_gtkmm_la_SOURCES += ../filters/g3fax.cpp
>+libutsushi_gtkmm_la_SOURCES += ../filters/pdf/array.cpp
>+libutsushi_gtkmm_la_SOURCES += ../filters/pdf/dictionary.cpp
>+libutsushi_gtkmm_la_SOURCES += ../filters/pdf/object.cpp
>+libutsushi_gtkmm_la_SOURCES += ../filters/pdf/primitive.cpp
>+libutsushi_gtkmm_la_SOURCES += ../filters/pdf/writer.cpp
>+
>+## FIXME: These *DIR defines should be removed.  The run-time should
>+## get all these locations from a configuration file so stuff can be
>+## moved around without the need for recompilation.
>+AM_CPPFLAGS += -DPKGLIBEXECDIR="\"$(pkglibexecdir)\""
>+AM_CPPFLAGS += -DPKGLIBDIR="\"$(pkglibdir)\""
>+AM_CPPFLAGS += -DPKGDATADIR="\"$(pkgdatadir)\""
>+AM_CPPFLAGS += -DLOCALEDIR="\"$(localedir)\""
>+AM_CPPFLAGS += -DPKGSYSCONFDIR="\"$(pkgsysconfdir)\""
>+AM_CPPFLAGS += -DPKGCONFFILE="\"$(PACKAGE_TARNAME).conf\""
>+AM_CPPFLAGS += -DCOMBOCONFFILE="\"combo.conf\""
> 
> AM_CXXFLAGS += $(LIBGTKMM_CFLAGS)
> AM_LDFLAGS  += $(BOOST_LDFLAGS)

--- utsushi-0.54.0/lib/Makefile.am	2019-03-06 03:44:11.000000000 +0100
+++ utsushi-0.54.0/lib/Makefile.am.new	2019-04-02 15:30:02.282227641 +0200
@@ -61,11 +61,17 @@ outputs += ../outputs/tiff.cpp
 outputs += ../outputs/tiff.hpp
 endif
 
+connexions  =
+connexions += ../connexions/hexdump.cpp
+connexions += ../connexions/usb.cpp
+
 pkglib_LTLIBRARIES = libutsushi.la
 libutsushi_la_LIBADD   = $(LIBUTSUSHI_LIBS)
 libutsushi_la_LIBADD  += $(LIBLTDL)
 libutsushi_la_LIBADD  += $(LTLIBINTL)
 libutsushi_la_LIBADD  += $(LIBUDEV_LIBS)
+libutsushi_la_LIBADD  += $(LIBUSB_LIBS)
+libutsushi_la_LIBADD  += -lpthread
 libutsushi_la_SOURCES  = connexion.cpp
 libutsushi_la_SOURCES += device-info.cpp
 libutsushi_la_SOURCES += exception.cpp
@@ -87,6 +93,8 @@ libutsushi_la_SOURCES += udev.cpp
 libutsushi_la_SOURCES += udev.hpp
 endif
 
+libutsushi_la_SOURCES += $(connexions)
+
 AM_CPPFLAGS += $(LTDLINCL)
 ## FIXME: These *DIR defines should be removed.  The run-time should
 ## get all these locations from a configuration file so stuff can be
--- utsushi-0.54.0/filters/Makefile.am	2019-03-06 03:44:11.000000000 +0100
+++ utsushi-0.54.0/filters/Makefile.am.new	2019-04-02 15:00:27.509580940 +0200
@@ -41,7 +41,8 @@ filterlib_LTLIBRARIES  = libflt-all.la
 libflt_all_la_CPPFLAGS  = $(AM_CPPFLAGS)
 libflt_all_la_CXXFLAGS  = $(AM_CXXFLAGS)
 libflt_all_la_LDFLAGS   = $(filter_ldflags)
-libflt_all_la_LIBADD    =
+libflt_all_la_LIBADD    = $(LIBUTSUSHI_LIBS)
+libflt_all_la_LIBADD   += $(LIBLTDL)
 libflt_all_la_SOURCES   =
 libflt_all_la_SOURCES  += g3fax.cpp
 libflt_all_la_SOURCES  += g3fax.hpp
@@ -85,10 +86,34 @@ libflt_all_la_SOURCES   += deskew.hpp
 endif				# have_libmagick_pp
 
 libflt_all_la_CPPFLAGS  += -DPKGLIBEXECDIR="\"$(pkglibexecdir)\""
+libflt_all_la_CPPFLAGS  += -DPKGLIBDIR="\"$(pkglibdir)\""
+libflt_all_la_CPPFLAGS  += -DPKGDATADIR="\"$(pkgdatadir)\""
+libflt_all_la_CPPFLAGS  += -DLOCALEDIR="\"$(localedir)\""
+libflt_all_la_CPPFLAGS  += -DPKGSYSCONFDIR="\"$(pkgsysconfdir)\""
+libflt_all_la_CPPFLAGS  += -DPKGCONFFILE="\"$(PACKAGE_TARNAME).conf\""
+libflt_all_la_CPPFLAGS  += -DCOMBOCONFFILE="\"combo.conf\""
 libflt_all_la_SOURCES   += reorient.cpp
 libflt_all_la_SOURCES   += reorient.hpp
 dist_pkglibexec_SCRIPTS += get-text-orientation
 
+libflt_all_la_SOURCES   += ../lib/context.cpp
+libflt_all_la_SOURCES   += ../lib/iobase.cpp
+libflt_all_la_SOURCES   += ../lib/filter.cpp
+libflt_all_la_SOURCES   += ../lib/octet.cpp
+libflt_all_la_SOURCES   += ../lib/string.cpp
+libflt_all_la_SOURCES   += ../lib/tag.cpp
+libflt_all_la_SOURCES   += ../lib/quantity.cpp
+libflt_all_la_SOURCES   += ../lib/range.cpp
+libflt_all_la_SOURCES   += ../lib/key.cpp
+libflt_all_la_SOURCES   += ../lib/option.cpp
+libflt_all_la_SOURCES   += ../lib/descriptor.cpp
+libflt_all_la_SOURCES   += ../lib/log.cpp
+libflt_all_la_SOURCES   += ../lib/value.cpp
+libflt_all_la_SOURCES   += ../lib/toggle.cpp
+libflt_all_la_SOURCES   += ../lib/store.cpp
+libflt_all_la_SOURCES   += ../lib/constraint.cpp
+libflt_all_la_SOURCES   += ../lib/run-time.cpp
+
 pdf_filter  =
 pdf_filter += pdf.cpp
 pdf_filter += pdf.hpp
 
 AM_CXXFLAGS += $(LIBGTKMM_CFLAGS)
 AM_LDFLAGS  += $(BOOST_LDFLAGS)
--- utsushi-0.54.0/gtkmm/Makefile.am	2019-03-06 03:44:11.000000000 +0100
+++ utsushi-0.54.0/gtkmm/Makefile.am.new	2019-04-02 16:11:52.638004644 +0200
@@ -28,6 +28,7 @@ gtkmmlib_LTLIBRARIES = libutsushi-gtkmm.
 libutsushi_gtkmm_la_LIBADD  = ../lib/libutsushi.la
 libutsushi_gtkmm_la_LIBADD += $(LIBGTKMM_LIBS)
 libutsushi_gtkmm_la_LIBADD += $(BOOST_THREAD_LIB)
+libutsushi_gtkmm_la_LIBADD += $(LIBJPEG_LIBS)
 libutsushi_gtkmm_la_SOURCES  =
 libutsushi_gtkmm_la_SOURCES += action-dialog.cpp
 libutsushi_gtkmm_la_SOURCES += action-dialog.hpp
@@ -47,6 +48,33 @@ libutsushi_gtkmm_la_SOURCES += preview.c
 libutsushi_gtkmm_la_SOURCES += preview.hpp
 libutsushi_gtkmm_la_SOURCES += pump.cpp
 libutsushi_gtkmm_la_SOURCES += pump.hpp
+libutsushi_gtkmm_la_SOURCES += ../filters/image-skip.cpp
+libutsushi_gtkmm_la_SOURCES += ../filters/jpeg.cpp
+libutsushi_gtkmm_la_SOURCES += ../filters/magick.cpp
+libutsushi_gtkmm_la_SOURCES += ../filters/autocrop.cpp
+libutsushi_gtkmm_la_SOURCES += ../filters/deskew.cpp
+libutsushi_gtkmm_la_SOURCES += ../filters/padding.cpp
+libutsushi_gtkmm_la_SOURCES += ../filters/reorient.cpp
+libutsushi_gtkmm_la_SOURCES += ../filters/shell-pipe.cpp
+libutsushi_gtkmm_la_SOURCES += ../filters/pnm.cpp
+libutsushi_gtkmm_la_SOURCES += ../filters/pdf.cpp
+libutsushi_gtkmm_la_SOURCES += ../filters/g3fax.cpp
+libutsushi_gtkmm_la_SOURCES += ../filters/pdf/array.cpp
+libutsushi_gtkmm_la_SOURCES += ../filters/pdf/dictionary.cpp
+libutsushi_gtkmm_la_SOURCES += ../filters/pdf/object.cpp
+libutsushi_gtkmm_la_SOURCES += ../filters/pdf/primitive.cpp
+libutsushi_gtkmm_la_SOURCES += ../filters/pdf/writer.cpp
+
+## FIXME: These *DIR defines should be removed.  The run-time should
+## get all these locations from a configuration file so stuff can be
+## moved around without the need for recompilation.
+AM_CPPFLAGS += -DPKGLIBEXECDIR="\"$(pkglibexecdir)\""
+AM_CPPFLAGS += -DPKGLIBDIR="\"$(pkglibdir)\""
+AM_CPPFLAGS += -DPKGDATADIR="\"$(pkgdatadir)\""
+AM_CPPFLAGS += -DLOCALEDIR="\"$(localedir)\""
+AM_CPPFLAGS += -DPKGSYSCONFDIR="\"$(pkgsysconfdir)\""
+AM_CPPFLAGS += -DPKGCONFFILE="\"$(PACKAGE_TARNAME).conf\""
+AM_CPPFLAGS += -DCOMBOCONFFILE="\"combo.conf\""
 
 AM_CXXFLAGS += $(LIBGTKMM_CFLAGS)
 AM_LDFLAGS  += $(BOOST_LDFLAGS)

Actions: View | Diff

Attachments on bug 26542: 11609 | 11610 | 11612 | 11613 | 11614 | 11615 | 11656