From c66bb0ec63d03d03183da5840775425fe53cdbb35e1c509d6c242928d79b559f Mon Sep 17 00:00:00 2001 From: Ruediger Oertel Date: Sun, 4 Apr 2010 17:37:53 +0000 Subject: [PATCH 1/4] Accepting request 36891 from home:oertel:branches:openSUSE:Factory Copy from home:oertel:branches:openSUSE:Factory/WindowMaker via accept of submit request 36891 revision 3. Request was accepted with message: forward OBS-URL: https://build.opensuse.org/request/show/36891 OBS-URL: https://build.opensuse.org/package/show/X11:windowmanagers/WindowMaker?expand=0&rev=6 --- WindowMaker.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WindowMaker.spec b/WindowMaker.spec index b58d1b4..69f3905 100644 --- a/WindowMaker.spec +++ b/WindowMaker.spec @@ -29,7 +29,7 @@ Requires: xdg-menu AutoReqProv: on Summary: A Colorful and Flexible Window Manager Version: 0.92.0 -Release: 208 +Release: 207 Source: Window-Maker-5a2507602c48.tar.bz2 Source1: WindowMaker-extra-0.1.tar.bz2 Source2: SuSE-theme.tar.bz2 From d3c9f9ca88a808ddb05da1cbeb1c35932bf960c680eda12f6f4512eeb8c9268d Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Sun, 4 Apr 2010 18:05:12 +0000 Subject: [PATCH 2/4] Accepting request 36897 from X11:windowmanagers checked in (request 36897) OBS-URL: https://build.opensuse.org/request/show/36897 OBS-URL: https://build.opensuse.org/package/show/X11:windowmanagers/WindowMaker?expand=0&rev=7 --- WindowMaker-png_check_sig.patch | 11 ----------- WindowMaker.changes | 5 ----- WindowMaker.spec | 2 -- 3 files changed, 18 deletions(-) delete mode 100644 WindowMaker-png_check_sig.patch diff --git a/WindowMaker-png_check_sig.patch b/WindowMaker-png_check_sig.patch deleted file mode 100644 index 9e964b8..0000000 --- a/WindowMaker-png_check_sig.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- wrlib/load.c -+++ wrlib/load.c -@@ -348,7 +348,7 @@ - - #ifdef USE_PNG - /* check for PNG */ -- if (png_check_sig(buffer, 8)) -+ if (!png_sig_cmp(buffer, 0, 8)) - return IM_PNG; - #endif - diff --git a/WindowMaker.changes b/WindowMaker.changes index f8c2d9f..7457012 100644 --- a/WindowMaker.changes +++ b/WindowMaker.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Sun Apr 4 18:59:43 CEST 2010 - ro@suse.de - -- fix build with libpng14 - ------------------------------------------------------------------- Mon Mar 30 03:31:24 CEST 2009 - crrodriguez@suse.de diff --git a/WindowMaker.spec b/WindowMaker.spec index 69f3905..86219ce 100644 --- a/WindowMaker.spec +++ b/WindowMaker.spec @@ -52,7 +52,6 @@ Patch37: WindowMaker-event.patch Patch38: WindowMaker-wmspec.c-findBestIcon.patch Patch39: WindowMaker-dir-specification.patch Patch40: WindowMaker-composite.patch -Patch41: WindowMaker-png_check_sig.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %package devel @@ -100,7 +99,6 @@ cp WindowMaker/{menu.*,plmenu.*} menu.orig %patch38 %patch39 %patch40 -%patch41 cp %{S:4} . cp %{S:6} . rename no nb po/no.* From e82d73b120f5dba34972c0985fb696fbc13a76c0b45c496a4c41514f7beaa65e Mon Sep 17 00:00:00 2001 From: "Michal Hrusecky (old before rename to _miska_)" Date: Wed, 27 Jul 2011 11:42:14 +0000 Subject: [PATCH 3/4] Accepting request 77134 from home:aturrini:branches:X11:windowmanagers Fixed typos in description of WindowMaker.spec OBS-URL: https://build.opensuse.org/request/show/77134 OBS-URL: https://build.opensuse.org/package/show/X11:windowmanagers/WindowMaker?expand=0&rev=8 --- WindowMaker-png_check_sig.patch | 11 +++++++++++ WindowMaker.changes | 10 ++++++++++ WindowMaker.spec | 6 ++++-- 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 WindowMaker-png_check_sig.patch diff --git a/WindowMaker-png_check_sig.patch b/WindowMaker-png_check_sig.patch new file mode 100644 index 0000000..9e964b8 --- /dev/null +++ b/WindowMaker-png_check_sig.patch @@ -0,0 +1,11 @@ +--- wrlib/load.c ++++ wrlib/load.c +@@ -348,7 +348,7 @@ + + #ifdef USE_PNG + /* check for PNG */ +- if (png_check_sig(buffer, 8)) ++ if (!png_sig_cmp(buffer, 0, 8)) + return IM_PNG; + #endif + diff --git a/WindowMaker.changes b/WindowMaker.changes index 7457012..f96182a 100644 --- a/WindowMaker.changes +++ b/WindowMaker.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Jul 26 19:45:06 UTC 2011 - andrea.turrini@gmail.com + +- fixed typos in description of WindowMaker.spec + +------------------------------------------------------------------- +Sun Apr 4 18:59:43 CEST 2010 - ro@suse.de + +- fix build with libpng14 + ------------------------------------------------------------------- Mon Mar 30 03:31:24 CEST 2009 - crrodriguez@suse.de diff --git a/WindowMaker.spec b/WindowMaker.spec index 86219ce..d4eda33 100644 --- a/WindowMaker.spec +++ b/WindowMaker.spec @@ -29,7 +29,7 @@ Requires: xdg-menu AutoReqProv: on Summary: A Colorful and Flexible Window Manager Version: 0.92.0 -Release: 207 +Release: 208 Source: Window-Maker-5a2507602c48.tar.bz2 Source1: WindowMaker-extra-0.1.tar.bz2 Source2: SuSE-theme.tar.bz2 @@ -52,6 +52,7 @@ Patch37: WindowMaker-event.patch Patch38: WindowMaker-wmspec.c-findBestIcon.patch Patch39: WindowMaker-dir-specification.patch Patch40: WindowMaker-composite.patch +Patch41: WindowMaker-png_check_sig.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %package devel @@ -62,7 +63,7 @@ Group: Development/Libraries/X11 %description Window Maker is a colorful and flexible window manager and -thedesignnated successor of AfterStep. nFor more details, check +the designated successor of AfterStep. For more details, check http://www.windowmaker.org. @@ -99,6 +100,7 @@ cp WindowMaker/{menu.*,plmenu.*} menu.orig %patch38 %patch39 %patch40 +%patch41 cp %{S:4} . cp %{S:6} . rename no nb po/no.* From 0a94a7c726036ba4874edf56dfa1275514638044816bb1438ad7d2b3f2621a5d Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 5 Sep 2011 09:55:40 +0000 Subject: [PATCH 4/4] Accepting request 80292 from home:elvigia:branches:X11:windowmanagers - Fix linking problems with new gnu ld OBS-URL: https://build.opensuse.org/request/show/80292 OBS-URL: https://build.opensuse.org/package/show/X11:windowmanagers/WindowMaker?expand=0&rev=9 --- WindowMaker.changes | 5 +++++ WindowMaker.spec | 5 ++++- wm-linking.patch | 10 ++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 wm-linking.patch diff --git a/WindowMaker.changes b/WindowMaker.changes index f96182a..1cd2957 100644 --- a/WindowMaker.changes +++ b/WindowMaker.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 31 04:38:04 UTC 2011 - crrodriguez@opensuse.org + +- Fix linking problems with new gnu ld + ------------------------------------------------------------------- Tue Jul 26 19:45:06 UTC 2011 - andrea.turrini@gmail.com diff --git a/WindowMaker.spec b/WindowMaker.spec index d4eda33..962068e 100644 --- a/WindowMaker.spec +++ b/WindowMaker.spec @@ -19,7 +19,7 @@ Name: WindowMaker -BuildRequires: freetype2-devel gcc-c++ giflib-devel libpng-devel libtiff-devel update-desktop-files xorg-x11-devel +BuildRequires: freetype2-devel fontconfig-devel gcc-c++ giflib-devel libpng-devel libtiff-devel update-desktop-files xorg-x11-devel License: GPLv2+ ; LGPLv2.1+ ; Public Domain, Freeware Group: System/GUI/Other Url: http://www.windowmaker.info/ @@ -53,6 +53,8 @@ Patch38: WindowMaker-wmspec.c-findBestIcon.patch Patch39: WindowMaker-dir-specification.patch Patch40: WindowMaker-composite.patch Patch41: WindowMaker-png_check_sig.patch +Patch42: wm-linking.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-build %package devel @@ -101,6 +103,7 @@ cp WindowMaker/{menu.*,plmenu.*} menu.orig %patch39 %patch40 %patch41 +%patch42 cp %{S:4} . cp %{S:6} . rename no nb po/no.* diff --git a/wm-linking.patch b/wm-linking.patch new file mode 100644 index 0000000..0087ca9 --- /dev/null +++ b/wm-linking.patch @@ -0,0 +1,10 @@ +--- WPrefs.app/Makefile.am.orig ++++ WPrefs.app/Makefile.am +@@ -55,5 +55,6 @@ WPrefs_LDADD = \ + $(top_builddir)/WINGs/libWUtil.la\ + $(top_builddir)/wrlib/libwraster.la \ + @XFTLIBS@ \ +- @INTLIBS@ ++ @INTLIBS@ \ ++ -lfontconfig +