[Pkg-xfce-commits] r5682 - in goodies/trunk/parole/debian: . patches

[Yves-Alexis Perez]

Author: corsac
Date: 2011-04-23 17:40:23 +0000 (Sat, 23 Apr 2011)
New Revision: 5682

Modified:
   goodies/trunk/parole/debian/control
   goodies/trunk/parole/debian/patches/01_fix-implicit-dso-linking.patch
   goodies/trunk/parole/debian/rules
Log:
refresh patch, run xdt-autogen and don't specify -z,defs since we build plugins
and there's no way to remove that just for them


Modified: goodies/trunk/parole/debian/control
===================================================================
--- goodies/trunk/parole/debian/control	2011-04-23 15:23:44 UTC (rev 5681)
+++ goodies/trunk/parole/debian/control	2011-04-23 17:40:23 UTC (rev 5682)
@@ -8,7 +8,7 @@
  libgtk2.0-dev (>= 2.16), libgstreamer0.10-dev, 
  libgstreamer-plugins-base0.10-dev, libdbus-1-dev, libdbus-glib-1-dev,
  libxfcegui4-dev (>= 4.8.0), libnotify-dev, libtagc0-dev,
- hardening-includes
+ hardening-includes, xfce4-dev-tools, libtool, gtk-doc-tools
 Standards-Version: 3.9.2
 Homepage: http://goodies.xfce.org/projects/applications/parole
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/parole/

Modified: goodies/trunk/parole/debian/patches/01_fix-implicit-dso-linking.patch
===================================================================
--- goodies/trunk/parole/debian/patches/01_fix-implicit-dso-linking.patch	2011-04-23 15:23:44 UTC (rev 5681)
+++ goodies/trunk/parole/debian/patches/01_fix-implicit-dso-linking.patch	2011-04-23 17:40:23 UTC (rev 5682)
@@ -1,29 +1,81 @@
-Description: fix FTBFS with gold
-Author: Kevin Fenzi <kevin at tummy.com>
-Bug: http://bugzilla.xfce.org/show_bug.cgi?id=6244
-=== modified file 'src/Makefile.in'
---- old/src/Makefile.in	2010-04-28 21:42:11 +0000
-+++ new/src/Makefile.in	2010-10-28 19:19:02 +0000
-@@ -205,7 +205,7 @@
- INTLTOOL_PERL = @INTLTOOL_PERL@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
- LD = @LD@
--LDFLAGS = @LDFLAGS@
-+LDFLAGS = @LDFLAGS@ -lX11
- LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@
- LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@
- LIBNOTIFY_REQUIRED_VERSION = @LIBNOTIFY_REQUIRED_VERSION@
-
-=== modified file 'common/Makefile.in'
---- old/common/Makefile.in	2010-04-28 21:42:11 +0000
-+++ new/common/Makefile.in	2010-10-28 19:30:58 +0000
-@@ -199,7 +199,7 @@
- INTLTOOL_PERL = @INTLTOOL_PERL@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
- LD = @LD@
--LDFLAGS = @LDFLAGS@
-+LDFLAGS = @LDFLAGS@ -lX11
- LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@
- LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@
- LIBNOTIFY_REQUIRED_VERSION = @LIBNOTIFY_REQUIRED_VERSION@
-
+diff --git a/common/Makefile.am b/common/Makefile.am
+index bd51b3b..5139ca8 100644
+--- a/common/Makefile.am
++++ b/common/Makefile.am
+@@ -12,9 +12,12 @@ libparolecommon_la_CFLAGS =		\
+ 	$(GTK_CFLAGS)			\
+ 	$(LIBXFCE4UTIL_CFLAGS)
+ 
++libparolecommon_la_LIBADD =		\
++	$(X11_LIBS)
++
+ libparolescreensaver_la_SOURCES = 	\
+ 	parole-screensaver.c		\
+ 	parole-screensaver.h
+ 
+ libparolescreensaver_la_CFLAGS =	\
+-	$(GTK_CFLAGS)
+\ No newline at end of file
++	$(GTK_CFLAGS)
+diff --git a/configure.ac b/configure.ac
+index d1b65b0..d65568b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -96,6 +96,8 @@ XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [dbus_glib_minimum_version])
+ XDT_CHECK_PACKAGE([LIBXFCE4GUI], [libxfcegui4-1.0],[libxfcegui4_minimum_version])
+ XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0],[libxfce4util_minimum_version])
+ 
++XDT_CHECK_PACKAGE([X11], [x11])
++
+ #=======================================================#
+ #           Check for availability of libnotify         #
+ #=======================================================#
+diff --git a/plugins/properties/Makefile.am b/plugins/properties/Makefile.am
+index f4169d0..cc26157 100644
+--- a/plugins/properties/Makefile.am
++++ b/plugins/properties/Makefile.am
+@@ -23,6 +23,10 @@ stream_properties_la_CFLAGS =			\
+ 	$(LIBXFCE4UTIL_CFLAGS)
+ 
+ stream_properties_la_LIBADD =			\
++	$(top_builddir)/parole/libparole.la	\
++	$(PLATFORM_LIBS)			\
++	$(GTK_LIBS)				\
++	$(LIBXFCE4UTIL_LIBS)	\
+ 	$(TAGLIBC_LIBS)
+ 
+ stream_properties_la_LDFLAGS =			\
+diff --git a/plugins/tray/Makefile.am b/plugins/tray/Makefile.am
+index a240229..0c82253 100644
+--- a/plugins/tray/Makefile.am
++++ b/plugins/tray/Makefile.am
+@@ -30,6 +30,8 @@ tray_icon_la_LDFLAGS =				\
+ 	$(PLATFORM_LDFLAGS)
+ 
+ tray_icon_la_LIBADD =				\
++	$(top_builddir)/parole/libparole.la	\
++	$(LIBXFCE4UTIL_LIBS)	\
+ 	$(LIBNOTIFY_LIBS)
+ 
+ #
+@@ -44,4 +46,4 @@ EXTRA_DIST = 		  	\
+ 	$(desktop_in_files)
+     
+ DISTCLEANFILES = 		\
+-	$(desktop_DATA)
+\ No newline at end of file
++	$(desktop_DATA)
+diff --git a/src/Makefile.am b/src/Makefile.am
+index b2928a8..8bbaa6a 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -85,7 +85,8 @@ parole_LDADD =					\
+         $(LIBXFCE4GUI_LIBS)                     \
+ 	$(GST_VIDEO_LIBS)			\
+ 	$(GST_INTERFACES_LIBS)			\
+-	$(TAGLIBC_LIBS)
++	$(TAGLIBC_LIBS)	\
++	$(X11_LIBS)
+ 	
+ parole_glib_enum_headers =			\
+ 	parole-conf.h				\

Modified: goodies/trunk/parole/debian/rules
===================================================================
--- goodies/trunk/parole/debian/rules	2011-04-23 15:23:44 UTC (rev 5681)
+++ goodies/trunk/parole/debian/rules	2011-04-23 17:40:23 UTC (rev 5682)
@@ -6,7 +6,7 @@
 
 LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
 CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
-LDFLAGS+=-Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+LDFLAGS+=-Wl,-O1 -Wl,--as-needed
 CFLAGS+=$(HARDENING_CFLAGS)
 LDFLAGS+=$(HARDENING_LDFLAGS)
 
@@ -15,6 +15,10 @@
 %:
 	dh $@
 
+override_dh_auto_configure:
+	NOCONFIGURE=1 xdt-autogen
+	dh_auto_configure
+
 override_dh_makeshlibs:
 	dh_makeshlibs -X usr/lib/parole-0