Hello community,
here is the log from the commit of package WindowMaker-applets for
openSUSE:Factory checked in at 2017-12-06 08:59:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/WindowMaker-applets (Old)
and /work/SRC/openSUSE:Factory/.WindowMaker-applets.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "WindowMaker-applets"
Wed Dec 6 08:59:46 2017 rev:32 rq:548537 version:1.0.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/WindowMaker-applets/WindowMaker-applets.changes
2017-08-10 14:13:06.731929167 +0200
+++
/work/SRC/openSUSE:Factory/.WindowMaker-applets.new/WindowMaker-applets.changes
2017-12-06 08:59:47.670337792 +0100
@@ -1,0 +2,8 @@
+Wed Nov 29 13:23:23 UTC 2017 - [email protected]
+
+- wmSun-1.03.dif, wmnd_0.2.2.patch: Fix build with as-needed
+- Only BuildRequire packages that are actually needed, this
+ change is needed to also cleaup WindowMaker-devel incorrect
+ dependencies
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ WindowMaker-applets.spec ++++++
--- /var/tmp/diff_new_pack.MxDci9/_old 2017-12-06 08:59:48.914292259 +0100
+++ /var/tmp/diff_new_pack.MxDci9/_new 2017-12-06 08:59:48.914292259 +0100
@@ -22,8 +22,18 @@
BuildRequires: curl-devel
BuildRequires: fdupes
BuildRequires: gcc-c++
-BuildRequires: gtk2-devel
-BuildRequires: xorg-x11
+BuildRequires: imake
+BuildRequires: pkgconfig(gdk-x11-2.0)
+BuildRequires: pkgconfig(glib-2.0)
+BuildRequires: pkgconfig(gobject-2.0)
+BuildRequires: pkgconfig(gtk+-x11-2.0)
+BuildRequires: pkgconfig(x11)
+BuildRequires: pkgconfig(xext)
+BuildRequires: pkgconfig(xpm)
+BuildRequires: pkgconfig(xt)
+BuildRequires: pkgconfig(xxf86dga)
+BuildRequires: pkgconfig(xxf86vm)
+
%if 0%{?suse_version} >= 1210
BuildRequires: libv4l-devel >= 0.8.4
%endif
@@ -349,9 +359,6 @@
%patch50 -p2
%build
-# This package failed when testing with -Wl,-as-needed being default.
-# So we disable it here, if you want to retest, just delete this comment and
the line below.
-export SUSE_ASNEEDED=0
RPM_OPT_FLAGS+=" -fgnu89-inline"
xmkmf -a
make CXXFLAGS="$RPM_OPT_FLAGS"
@@ -461,7 +468,7 @@
CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --mandir=%{_mandir}
make
cd ../wmcliphist
-make CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -Wall -ansi `pkg-config
--cflags gtk+-2.0` -I. -Ifoodock"
+make CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -Wall `pkg-config --cflags
gtk+-2.0` -I. -Ifoodock"
#
cd ../wmisdn-%{wmisdn_version}
make CFLAGS="$RPM_OPT_FLAGS"
++++++ wmSun-1.03.dif ++++++
--- /var/tmp/diff_new_pack.MxDci9/_old 2017-12-06 08:59:49.126284499 +0100
+++ /var/tmp/diff_new_pack.MxDci9/_new 2017-12-06 08:59:49.126284499 +0100
@@ -1,6 +1,8 @@
---- wmSun/SunRise.c
+Index: wmSun/SunRise.c
+===================================================================
+--- wmSun/SunRise.c.orig
+++ wmSun/SunRise.c
-@@ -11,7 +11,7 @@
+@@ -11,7 +11,7 @@ double sinEPS = 0.39778;
double P2 = 6.283185307;
@@ -9,7 +11,7 @@
double UT, ym, y0, yp, SinH0;
double xe, ye, z1, z2, SinH(), hour24();
-@@ -80,7 +80,7 @@
+@@ -80,7 +80,7 @@ SunRise(int year, int month, int day, do
}
@@ -18,3 +20,25 @@
if (UT < 0.0) {
+Index: wmSun/Makefile
+===================================================================
+--- wmSun/Makefile.orig
++++ wmSun/Makefile
+@@ -11,7 +11,7 @@ LIBDIR = -L/usr/X11R6/lib
+ #
+ # For Linux (and other?) Machines...
+ #
+-LIBS = -lXpm -lX11 -lXext
++LIBS = -lXpm -lX11 -lXext -lm
+ #
+ # For Sun Solaris Machines (I know it compiles on 2.6)...
+ #
+@@ -29,7 +29,7 @@ all: wmSun.o wmSun
+
+ wmSun.o: wmSun_master.xpm wmSun_mask.xbm
+ wmSun: $(OBJS)
+- $(CC) $(COPTS) $(SYSTEM) -lm -o wmSun $^ $(INCDIR) $(LIBDIR) $(LIBS)
++ $(CC) $(COPTS) $(SYSTEM) -o wmSun $^ $(INCDIR) $(LIBDIR) $(LIBS)
+
+ clean:
+ for i in $(OBJS) ; do \
++++++ wmnd_0.2.2.patch ++++++
--- /var/tmp/diff_new_pack.MxDci9/_old 2017-12-06 08:59:49.238280400 +0100
+++ /var/tmp/diff_new_pack.MxDci9/_new 2017-12-06 08:59:49.238280400 +0100
@@ -1,17 +1,31 @@
---- Makefile
+Index: Makefile
+===================================================================
+--- Makefile.orig
+++ Makefile
-@@ -19,8 +19,8 @@
+@@ -19,8 +19,8 @@ CFLAGS = -Wall -O3 -fomit-frame-pointer
# Test coverage
#CFLAGS = -fprofile-arcs -ftest-coverage -Wall -pipe -DPRO $(OSFLAGS)
-
-LDFLAGS = -L/usr/X11R6/lib -lXpm -lXext -lX11
+LIBDIR = -L/usr/X11R6/lib
-+LDFLAGS = $(LIBDIR) -lXpm -lXext -lX11
++LIBS = -lXpm -lXext -lX11
OBJS = wmnd.o beat.o misc.o list.o
---- src/wmnd.c
+@@ -34,6 +34,9 @@ all: $(PJ)
+
+ $(PJ): $(OBJS)
+
++wmnd : $(OBJS)
++ $(CC) $(CFLAGS) $(OBJS) -o wmnd $(LIBS)
++
+ %.gz: %
+ gzip -c9 $^ > $@
+
+Index: src/wmnd.c
+===================================================================
+--- src/wmnd.c.orig
+++ src/wmnd.c
@@ -38,15 +38,16 @@
@@ -34,7 +48,7 @@
#define MAX(x,y) (((x)<(y))?(y):(x))
-@@ -56,7 +57,6 @@
+@@ -56,7 +57,6 @@ kstat_t *if_ksp = NULL;
#else /* do not USE_KSTAT, reverting to Linux */
#include <getopt.h>
@@ -42,7 +56,7 @@
#include <net/ppp_defs.h>
#include <net/if_ppp.h>
-@@ -175,7 +175,7 @@
+@@ -175,7 +175,7 @@ MRegion mr[32]; /* mouse regions */
/* GUI */
static void redraw_window(void);
unsigned long get_color(char *name);
@@ -51,7 +65,7 @@
/* config file read/write */
void conf_read(char *filename);
-@@ -357,7 +357,7 @@
+@@ -357,7 +357,7 @@ unsigned long get_color(char *name)
}
@@ -60,7 +74,7 @@
{
XpmAttributes attr;
XpmColorSymbol cols[3] = {
-@@ -450,6 +450,7 @@
+@@ -450,6 +450,7 @@ void new_window(char *name, int width, i
wmhints.flags =
StateHint | IconWindowHint | IconPositionHint | WindowGroupHint;
XSetWMHints(dockapp.d, dockapp.win, &wmhints);
@@ -68,7 +82,7 @@
XMapWindow(dockapp.d, dockapp.win);
dockapp.xfd = ConnectionNumber(dockapp.d);
-@@ -801,7 +802,7 @@
+@@ -801,7 +802,7 @@ int main(int argc, char **argv)
fprintf(stderr, "Unable to open display '%s'\n", dispname);
exit(-1);
}
@@ -77,7 +91,7 @@
add_mr(0, 3, 3, 38, 9); /* device */
add_mr(1, 54, 3, 7, 9); /* up/down packet/byte mode */
-@@ -1594,7 +1595,7 @@
+@@ -1594,7 +1595,7 @@ void draw_interface(void)
int i;
int c;
int k = 3;
