rpms/gthumb/devel gthumb-2.11.2-extension-linking.patch, NONE, 1.1 gthumb.spec, 1.112, 1.113

Tomas Bzatek tbzatek at fedoraproject.org
Mon Feb 8 10:36:45 UTC 2010 

Author: tbzatek

Update of /cvs/extras/rpms/gthumb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28913

Modified Files:
	gthumb.spec 
Added Files:
	gthumb-2.11.2-extension-linking.patch 
Log Message:
* Mon Feb  8 2010 Tomas Bzatek <tbzatek at redhat.com> - 2.11.1-5
- Fix extension linking with --as-needed (#562243)


gthumb-2.11.2-extension-linking.patch:
 catalogs/Makefile.am       |    2 +-
 edit_metadata/Makefile.am  |    2 +-
 exiv2/Makefile.am          |    2 +-
 gstreamer/Makefile.am      |    2 +-
 image_rotation/Makefile.am |    4 ++--
 jpeg_utils/Makefile.am     |    2 +-
 pixbuf_savers/Makefile.am  |    2 +-
 raw_files/Makefile.am      |    2 +-
 slideshow/Makefile.am      |    3 +--
 9 files changed, 10 insertions(+), 11 deletions(-)

--- NEW FILE gthumb-2.11.2-extension-linking.patch ---
>From cb48e227d614029392dad2d34ca48812687b7cdd Mon Sep 17 00:00:00 2001
From: Fryderyk Dziarmagowski <fdziarmagowski at gmail.com>
Date: Sun, 10 Jan 2010 11:39:22 +0000
Subject: Missing extension linking

Some extensions are "underlinked".

[bug #606507]
---
diff --git a/extensions/catalogs/Makefile.am b/extensions/catalogs/Makefile.am
index c031da3..93836d9 100644
--- a/extensions/catalogs/Makefile.am
+++ b/extensions/catalogs/Makefile.am
@@ -22,7 +22,7 @@ libcatalogs_la_SOURCES = 		\
 	gth-organize-task.h		\
 	main.c
 
-libcatalogs_la_CFLAGS = $(GTHUMB_CFLAGS) $(WARNINGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
+libcatalogs_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
 libcatalogs_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
 libcatalogs_la_LIBADD = $(GTHUMB_LIBS)
 libcatalogs_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
diff --git a/extensions/edit_metadata/Makefile.am b/extensions/edit_metadata/Makefile.am
index 904b301..07c9673 100644
--- a/extensions/edit_metadata/Makefile.am
+++ b/extensions/edit_metadata/Makefile.am
@@ -16,7 +16,7 @@ libedit_metadata_la_SOURCES = 		\
 	gth-edit-metadata-dialog.h	\
 	main.c
 
-libedit_metadata_la_CFLAGS = $(GTHUMB_CFLAGS) $(WARNINGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
+libedit_metadata_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
 libedit_metadata_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
 libedit_metadata_la_LIBADD = $(GTHUMB_LIBS)
 libedit_metadata_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
diff --git a/extensions/exiv2/Makefile.am b/extensions/exiv2/Makefile.am
index 1996c21..90fda37 100644
--- a/extensions/exiv2/Makefile.am
+++ b/extensions/exiv2/Makefile.am
@@ -16,7 +16,7 @@ libexiv2_la_SOURCES = 			\
 
 libexiv2_la_CPPFLAGS = $(GTHUMB_CFLAGS) $(EXIV2_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
 libexiv2_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
-libexiv2_la_LIBADD = $(GTHUMB_LIBS) 
+libexiv2_la_LIBADD = $(GTHUMB_LIBS) $(EXIV2_LIBS)
 libexiv2_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
 
 extensioninidir = $(extensiondir)
diff --git a/extensions/gstreamer/Makefile.am b/extensions/gstreamer/Makefile.am
index a97843a..6795cf5 100644
--- a/extensions/gstreamer/Makefile.am
+++ b/extensions/gstreamer/Makefile.am
@@ -21,7 +21,7 @@ libgstreamer_la_SOURCES = 			\
 
 libgstreamer_la_CPPFLAGS = $(GTHUMB_CFLAGS) $(GSTREAMER_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
 libgstreamer_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
-libgstreamer_la_LIBADD = $(GTHUMB_LIBS) 
+libgstreamer_la_LIBADD = $(GTHUMB_LIBS) $(GSTREAMER_LIBS)
 libgstreamer_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
 
 extensioninidir = $(extensiondir)
diff --git a/extensions/image_rotation/Makefile.am b/extensions/image_rotation/Makefile.am
index 3abca43..0fc5f82 100644
--- a/extensions/image_rotation/Makefile.am
+++ b/extensions/image_rotation/Makefile.am
@@ -13,9 +13,9 @@ libimage_rotation_la_SOURCES = 		\
 	rotation-utils.c		\
 	rotation-utils.h		
 
-libimage_rotation_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
+libimage_rotation_la_CFLAGS = $(GTHUMB_CFLAGS) $(JPEG_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
 libimage_rotation_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
-libimage_rotation_la_LIBADD = $(GTHUMB_LIBS) 
+libimage_rotation_la_LIBADD = $(GTHUMB_LIBS) $(JPEG_LIBS)
 libimage_rotation_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
 
 extensioninidir = $(extensiondir)
diff --git a/extensions/jpeg_utils/Makefile.am b/extensions/jpeg_utils/Makefile.am
index feb1295..d82b54a 100644
--- a/extensions/jpeg_utils/Makefile.am
+++ b/extensions/jpeg_utils/Makefile.am
@@ -16,7 +16,7 @@ else
 libjpeg_utils_la_SOURCES =
 endif
 
-libjpeg_utils_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
+libjpeg_utils_la_CFLAGS = $(GTHUMB_CFLAGS) $(JPEG_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
 libjpeg_utils_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
 libjpeg_utils_la_LIBADD = $(GTHUMB_LIBS) $(JPEG_LIBS)
 libjpeg_utils_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
diff --git a/extensions/pixbuf_savers/Makefile.am b/extensions/pixbuf_savers/Makefile.am
index 7b291fe..bcb8718 100644
--- a/extensions/pixbuf_savers/Makefile.am
+++ b/extensions/pixbuf_savers/Makefile.am
@@ -45,7 +45,7 @@ libpixbuf_savers_la_SOURCES = 	\
 	main.c			\
 	preferences.c
 
-libpixbuf_savers_la_CFLAGS = $(GTHUMB_CFLAGS) $(CLUTTER_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
+libpixbuf_savers_la_CFLAGS = $(GTHUMB_CFLAGS) $(TIFF_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
 libpixbuf_savers_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
 libpixbuf_savers_la_LIBADD = $(GTHUMB_LIBS) $(TIFF_LIBS)
 libpixbuf_savers_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
diff --git a/extensions/raw_files/Makefile.am b/extensions/raw_files/Makefile.am
index 269f1dd..1342333 100644
--- a/extensions/raw_files/Makefile.am
+++ b/extensions/raw_files/Makefile.am
@@ -6,7 +6,7 @@ libraw_files_la_SOURCES = \
 
 libraw_files_la_CFLAGS = $(GTHUMB_CFLAGS) $(LIBOPENRAW_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
 libraw_files_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
-libraw_files_la_LIBADD = $(GTHUMB_LIBS)
+libraw_files_la_LIBADD = $(GTHUMB_LIBS) $(LIBOPENRAW_LIBS)
 libraw_files_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
 
 extensioninidir = $(extensiondir)
diff --git a/extensions/slideshow/Makefile.am b/extensions/slideshow/Makefile.am
index 1033f5c..8b96312 100644
--- a/extensions/slideshow/Makefile.am
+++ b/extensions/slideshow/Makefile.am
@@ -20,7 +20,7 @@ libslideshow_la_SOURCES = 		\
 
 libslideshow_la_CFLAGS = $(GTHUMB_CFLAGS) $(CLUTTER_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
 libslideshow_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
-libslideshow_la_LIBADD = $(GTHUMB_LIBS)
+libslideshow_la_LIBADD = $(GTHUMB_LIBS) $(CLUTTER_LIBS)
 libslideshow_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
 
 extensioninidir = $(extensiondir)
--
cgit v0.8.3.1


Index: gthumb.spec
===================================================================
RCS file: /cvs/extras/rpms/gthumb/devel/gthumb.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -p -r1.112 -r1.113
--- gthumb.spec	3 Feb 2010 14:55:28 -0000	1.112
+++ gthumb.spec	8 Feb 2010 10:36:45 -0000	1.113
@@ -13,7 +13,7 @@
 Summary: Image viewer, editor, organizer
 Name: gthumb
 Version: 2.11.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://gthumb.sourceforge.net
 Source0: http://download.gnome.org/sources/gthumb/2.11/%{name}-%{version}.tar.bz2
 Source1: gthumb-importer
@@ -22,6 +22,7 @@ Source2: gthumb-importer.desktop
 Patch0: gthumb-cflags.patch
 # from upstream
 Patch1: gthumb-2.11.1-disable-deprecated.patch
+Patch2: gthumb-2.11.2-extension-linking.patch
 
 License: GPLv2+
 Group: User Interface/X
@@ -70,6 +71,7 @@ package.
 %setup -q
 %patch0 -p1 -b .cflags
 %patch1 -p1 -b .disable-deprecated
+%patch2 -p1 -b .extension-linking
 
 # force regeneration
 rm -f data/gthumb.schemas
@@ -148,6 +150,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_includedir}/gthumb-2.0
 
 %changelog
+* Mon Feb  8 2010 Tomas Bzatek <tbzatek at redhat.com> - 2.11.1-5
+- Fix extension linking with --as-needed (#562243)
+
 * Wed Feb  3 2010 Tomas Bzatek <tbzatek at redhat.com> - 2.11.1-4
 - Enable clutter and gstreamer integration

More information about the scm-commits mailing list