Hello community,
here is the log from the commit of package WindowMaker-applets for
openSUSE:Factory
checked in at Mon Sep 19 21:21:16 CEST 2011.
--------
--- WindowMaker-applets/WindowMaker-applets.changes 2011-07-07
13:12:41.000000000 +0200
+++
/mounts/work_src_done/STABLE/WindowMaker-applets/WindowMaker-applets.changes
2011-09-17 17:37:01.000000000 +0200
@@ -1,0 +2,9 @@
+Sat Sep 17 15:33:52 UTC 2011 - [email protected]
+
+- fixed build for factory:
+ * added Patch47 wmfire-0.0.3.9pre4-configure_fix.diff (fixes x_includes
+ and x_libraries handling in configure.in - this needs an autoreconf)
+ * added Patch48: wmswallow-0.6.1-ld_fix.diff (add -lX11)
+ * added Patch49: wmcliphist-1.0-ld_fix.diff (add -lX11)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
wmcliphist-1.0-ld_fix.diff
wmfire-0.0.3.9pre4-configure_fix.diff
wmswallow-0.6.1-ld_fix.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ WindowMaker-applets.spec ++++++
--- /var/tmp/diff_new_pack.jqqqCt/_old 2011-09-19 21:21:11.000000000 +0200
+++ /var/tmp/diff_new_pack.jqqqCt/_new 2011-09-19 21:21:11.000000000 +0200
@@ -215,6 +215,9 @@
Patch44: WMMail-automake.patch
Patch45: WMMail-fewargs.patch
Patch46: wmSMPmon-Support-selecting-CPUs-to-display.patch
+Patch47: wmfire-%{wmfire_version}-configure_fix.diff
+Patch48: wmswallow-%{wmswallow_version}-ld_fix.diff
+Patch49: wmcliphist-%{wmcliphist_version}-ld_fix.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -326,6 +329,12 @@
%patch41
cd ../wmisdn-%{wmisdn_version}
%patch42
+cd ../wmfire-%{wmfire_version}
+%patch47
+cd ../wmswallow
+%patch48
+cd ../wmcliphist
+%patch49
%build
# This package failed when testing with -Wl,-as-needed being default.
@@ -382,7 +391,7 @@
cd ../../wmgmon.app/src
make FLAGS="$RPM_OPT_FLAGS -Wall -I/usr/include"
cd ../../wmfire-%{wmfire_version}
-%{?suse_update_config:%{suse_update_config -f }}
+autoreconf -fi
CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" ./configure --prefix=/usr/
make
cd ../wmcube/wmcube
++++++ wmcliphist-1.0-ld_fix.diff ++++++
Index: Makefile
===================================================================
--- Makefile.orig
+++ Makefile
@@ -13,6 +13,7 @@ DEBUG =
#DEBUG = debug.o
LIBS = `pkg-config --libs gtk+-2.0`
+LIBS += `pkg-config --libs x11`
OBJECTS = wmcliphist.o clipboard.o gui.o rcconfig.o history.o hotkeys.o
utils.o $(DEBUG)
TARGET = wmcliphist
++++++ wmfire-0.0.3.9pre4-configure_fix.diff ++++++
Index: configure.in
===================================================================
--- configure.in.orig
+++ configure.in
@@ -9,7 +9,9 @@ AC_PROG_CC
dnl Checks for libraries.
AC_PATH_X
-X11LIBS="-L$x_libraries -I$x_includes -lX11 -lXpm -lXext"
+X11LIBS="-lX11 -lXpm -lXext"
+test -n "$x_libraries" && X11LIBS="-L$x_libraries $X11LIBS"
+test -n "$x_includes" && X11LIBS="-I$x_includes $X11LIBS"
AC_SUBST(X11LIBS)
AC_MSG_CHECKING([to see if we can use X])
AC_TRY_LINK([#include <X11/Xlib.h>],,AC_MSG_RESULT([yes]),AC_MSG_RESULT([uh..
no]); exit 1)
++++++ wmswallow-0.6.1-ld_fix.diff ++++++
Index: Makefile
===================================================================
--- Makefile.orig
+++ Makefile
@@ -5,7 +5,7 @@ RM=rm -f
X=/usr/X11R6
INCLUDES=-I$(X)/include
LIBPATHS=-L${X}/lib
-LIBS=-lXext
+LIBS=-lXext -lX11
PROG=wmswallow
OBJS=wmswallow.o
SH=/bin/sh
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
