[xfce4-session] Add patch to link with gobject.

Kevin Fenzi kevin at fedoraproject.org
Wed Feb 1 20:22:16 UTC 2012


commit 2965bcd924e33dd0eef9b2fca2805cfd2a8f48f1
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Wed Feb 1 13:22:13 2012 -0700

    Add patch to link with gobject.

 xfce4-session-4.8.2-gmodule-link.patch |   48 ++++++++++++++++++++++++++++++++
 xfce4-session.spec                     |   14 ++++++++-
 2 files changed, 60 insertions(+), 2 deletions(-)
---
diff --git a/xfce4-session-4.8.2-gmodule-link.patch b/xfce4-session-4.8.2-gmodule-link.patch
new file mode 100644
index 0000000..d98feb1
--- /dev/null
+++ b/xfce4-session-4.8.2-gmodule-link.patch
@@ -0,0 +1,48 @@
+--- xfce4-session-4.8.2/configure.in	
++++ xfce4-session-4.8.2/configure.in	
+@@ -82,6 +82,7 @@ XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.
+ XDT_CHECK_PACKAGE([LIBWNCK], [libwnck-1.0], [2.22])
+ XDT_CHECK_PACKAGE([DBUS], [dbus-1], [1.0.0])
+ XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.73])
++XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [])
+ XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.8.0])
+ 
+ dnl we provide a panel plugin now
+--- xfce4-session-4.8.2/settings/Makefile.am	
++++ xfce4-session-4.8.2/settings/Makefile.am	
+@@ -25,6 +25,7 @@ xfce4_session_settings_CFLAGS = \
+ 	-DMODULESDIR=\"$(libdir)/xfce4/session/splash-engines\" \
+ 	-DG_LOG_DOMAIN=\"xfce4-session-settings\" \
+ 	-I$(top_srcdir) \
++	$(GMODULE_CFLAGS) \
+ 	$(LIBXFCE4UTIL_CFLAGS) \
+ 	$(LIBXFCE4UI_CFLAGS) \
+ 	$(XFCONF_CFLAGS) \
+@@ -32,7 +33,8 @@ xfce4_session_settings_CFLAGS = \
+ 
+ xfce4_session_settings_LDADD = \
+ 	$(top_builddir)/libxfsm/libxfsm-4.6.la \
+-	$(LIBXFCE4UTIL_CFLAGS) \
++	$(GMODULE_LIBS) \
++	$(LIBXFCE4UTIL_LIBS) \
+ 	$(LIBXFCE4UI_LIBS) \
+ 	$(XFCONF_LIBS) \
+ 	$(DBUS_GLIB_LIBS)
+--- xfce4-session-4.8.2/xfce4-session/Makefile.am	
++++ xfce4-session-4.8.2/xfce4-session/Makefile.am	
+@@ -51,6 +51,7 @@ xfce4_session_SOURCES =							\
+ 	xfsm-startup.h
+ 
+ xfce4_session_CFLAGS =							\
++	$(GMODULE_CFLAGS)						\
+ 	$(GNOME_CFLAGS)							\
+ 	$(GNOME_KEYRING_CFLAGS)						\
+ 	$(LIBSM_CFLAGS)							\
+@@ -69,6 +70,7 @@ xfce4_session_CFLAGS =							\
+ 
+ xfce4_session_LDADD =							\
+ 	$(top_builddir)/libxfsm/libxfsm-4.6.la				\
++	$(GMODULE_LIBS)							\
+ 	$(LIBSM_LDFLAGS)						\
+ 	$(LIBSM_LIBS)							\
+ 	$(LIBX11_LDFLAGS)						\
diff --git a/xfce4-session.spec b/xfce4-session.spec
index e7ebf72..aee09ed 100644
--- a/xfce4-session.spec
+++ b/xfce4-session.spec
@@ -2,7 +2,7 @@
 
 Name:           xfce4-session
 Version:        4.8.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Xfce session manager
 
 Group:          User Interface/Desktops
@@ -15,10 +15,14 @@ Source1:        polkit-gnome-authentication-agent-1.desktop
 Patch0:         xfce4-session-4.7.2-hide-tips.patch
 # http://patches.ubuntu.com/x/xfce4-session/extracted/01_correct_shadows.patch
 Patch1:         xfce4-session-4.6.1-correct-shadows.patch
+# https://bugzilla.xfce.org/show_bug.cgi?id=8340
+Patch2:         xfce4-session-4.8.2-gmodule-link.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #BuildRequires:  dbus-devel 
 #BuildRequires:  dbus-glib-devel
+BuildRequires:  glib2-devel
 BuildRequires:  libglade2-devel
 BuildRequires:  libSM-devel
 BuildRequires:  libwnck-devel
@@ -37,6 +41,7 @@ BuildRequires:  intltool
 BuildRequires:  libxslt
 BuildRequires:  gnome-doc-utils
 BuildRequires:  libxml2
+BuildRequires:  xfce4-dev-tools
 Requires:       xorg-x11-server-utils
 Requires:       fortune-mod
 Requires:       polkit-gnome
@@ -66,14 +71,16 @@ Additional splash screen engines for the Xfce Session Manager.
 %setup -q
 %patch0 -p1 -b .hide-tips
 %patch1 -p1 -b .correct-shadows
+%patch2 -p1 -b .gobject-link
 
 
 %build
+xdt-autogen
 %configure --disable-static \
     --enable-gnome \
     --enable-libgnome-keyring \
     --enable-session-screenshots \
-    --enable-panel-plugin
+    --enable-panel-plugin 
     
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -158,6 +165,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/themes/Default/balou/
 
 %changelog
+* Wed Feb 01 2012 Kevin Fenzi <kevin at scrye.com> - 4.8.2-3
+- Add patch to link with gobject. 
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.8.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 


More information about the scm-commits mailing list