Hello community,
here is the log from the commit of package mate-session-manager for
openSUSE:Factory checked in at 2014-07-17 06:58:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mate-session-manager (Old)
and /work/SRC/openSUSE:Factory/.mate-session-manager.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mate-session-manager"
Changes:
--------
---
/work/SRC/openSUSE:Factory/mate-session-manager/mate-session-manager.changes
2014-03-22 18:02:16.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.mate-session-manager.new/mate-session-manager.changes
2014-07-17 06:58:25.000000000 +0200
@@ -1,0 +2,9 @@
+Wed Jul 16 11:21:15 UTC 2014 - [email protected]
+
+- Add mate-session-manager-check-for-X11-libraries.patch
+- Remove useless pkgconfig(pangox); mate-session-manager doesn't
+ build against pangox
+- Replace pkgconfig(systemd) with systemd-devel; systemd development
+ files are needed to build with systemd support
+
+-------------------------------------------------------------------
New:
----
mate-session-manager-check-for-X11-libraries.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mate-session-manager.spec ++++++
--- /var/tmp/diff_new_pack.RnOwuO/_old 2014-07-17 06:58:26.000000000 +0200
+++ /var/tmp/diff_new_pack.RnOwuO/_new 2014-07-17 06:58:26.000000000 +0200
@@ -27,6 +27,9 @@
Source1: mate-session-manager-upstream-mate_defaults.conf
# Some documentation for people writing branding packages, shipped in the
branding-upstream package
Source2: README.Gsettings-overrides
+# PATCH-FIX-UPSTREAM mate-session-manager-check-for-X11-libraries.patch
--remove pangox of configure script as
+# mate-session-manager doesn't build against it
+Patch0: mate-session-manager-check-for-X11-libraries.patch
%glib2_gsettings_schema_requires
@@ -37,11 +40,10 @@
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gtk+-2.0)
BuildRequires: pkgconfig(ice)
-BuildRequires: pkgconfig(pangox)
BuildRequires: pkgconfig(sm)
-BuildRequires: pkgconfig(systemd)
BuildRequires: pkgconfig(xau)
BuildRequires: pkgconfig(xext)
+BuildRequires: systemd-devel
BuildRequires: update-desktop-files
Requires: %{name}-branding = %{version}
Recommends: %{name}-lang
@@ -75,14 +77,17 @@
%prep
%setup -q
+%patch0 -p1
cp -a %{SOURCE2} .
cp -a %{SOURCE1} mate_defaults.conf
%build
+autoreconf -fiv
%configure --disable-upower \
--disable-static \
--enable-ipv6 \
- --with-default-wm=marco
+ --with-default-wm=marco \
+ --with-systemd=yes
make %{?_smp_mflags}
%install
++++++ mate-session-manager-check-for-X11-libraries.patch ++++++
--- a/configure.ac 2014-03-25 10:21:28.742946044 +0100
+++ b/configure.ac 2014-03-22 19:17:21.143070000 +0100
@@ -77,6 +77,7 @@
gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
)
+PKG_CHECK_MODULES(X11, x11)
PKG_CHECK_MODULES(SM, sm)
PKG_CHECK_MODULES(ICE, ice)
PKG_CHECK_MODULES(XEXT, xext xau)
@@ -148,44 +149,6 @@
AC_SUBST(HAVE_UPOWER)
dnl ====================================================================
-dnl X development libraries check
-dnl ====================================================================
-
-# If Pango included the shared library dependencies from X11 in
-# the pkg-config output, then we use that (to avoid duplicates).
-# but if they were omitted to avoid binary compatibility problems
-# then we need to repeat the checks.
-
-if $PKG_CONFIG --exists pangoxft ; then
- PANGO_PACKAGES="pangox pangoxft"
-else
- PANGO_PACKAGES="pangox"
-fi
-
-x_libs="`$PKG_CONFIG --libs $PANGO_PACKAGES`"
-case x_libs in
- *-lX11*) pango_omitted_x_deps=no ;;
- *) pango_omitted_x_deps=yes ;;
-esac
-
-if test $pango_omitted_x_deps = yes ; then
- AC_PATH_XTRA
-
- if test x$no_x = xyes ; then
- AC_MSG_ERROR([X development libraries not found])
- else
- X_LIBS="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
- fi
-fi
-
-AC_CHECK_LIB(Xau, XauFileName, [X_LIBS="$X_LIBS -lXau"],
- [AC_MSG_ERROR([
-*** Cant find the Xauth library. It is needed to compile mate-session.])],
- $X_LIBS)
-
-AC_SUBST(X_LIBS)
-
-dnl ====================================================================
dnl Check for XSync extension
dnl ====================================================================
--- a/mate-session/Makefile.am 2014-03-25 10:21:28.786946042 +0100
+++ b/mate-session/Makefile.am 2014-03-22 19:18:34.727067000 +0100
@@ -59,6 +59,7 @@
mate_session_CPPFLAGS = \
$(AM_CPPFLAGS) \
+ $(X11_CFLAGS) \
$(SM_CFLAGS) \
$(ICE_CFLAGS) \
$(XEXT_CFLAGS) \
@@ -71,6 +72,7 @@
mate_session_LDADD = \
libgsmutil.la \
+ $(X11_CFLAGS) \
$(top_builddir)/egg/libeggdesktopfile.la \
$(SM_LIBS) \
$(ICE_LIBS) \
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
