diff options
Diffstat (limited to 'wm/windowmaker/patches')
13 files changed, 31 insertions, 184 deletions
diff --git a/wm/windowmaker/patches/patch-ai b/wm/windowmaker/patches/patch-WINGs_dragsource.c index b160c3d74f1..4756ce1d08a 100644 --- a/wm/windowmaker/patches/patch-ai +++ b/wm/windowmaker/patches/patch-WINGs_dragsource.c @@ -1,6 +1,6 @@ -$NetBSD: patch-ai,v 1.3 2014/10/07 16:11:11 adam Exp $ +$NetBSD: patch-WINGs_dragsource.c,v 1.1 2015/10/16 10:42:23 adam Exp $ ---- WINGs/dragsource.c.orig 2014-08-30 12:29:09.000000000 +0000 +--- WINGs/dragsource.c.orig 2015-08-11 18:41:14.000000000 +0000 +++ WINGs/dragsource.c @@ -2,6 +2,8 @@ #include "wconfig.h" diff --git a/wm/windowmaker/patches/patch-af b/wm/windowmaker/patches/patch-WindowMaker_Defaults_Makefile.in index be1b14156e5..ac631771e6e 100644 --- a/wm/windowmaker/patches/patch-af +++ b/wm/windowmaker/patches/patch-WindowMaker_Defaults_Makefile.in @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.6 2013/05/21 14:38:40 hans Exp $ +$NetBSD: patch-WindowMaker_Defaults_Makefile.in,v 1.1 2015/10/16 10:42:23 adam Exp $ ---- WindowMaker/Defaults/Makefile.in.orig 2013-01-09 21:43:07.000000000 +0000 +--- WindowMaker/Defaults/Makefile.in.orig 2015-08-11 18:52:19.000000000 +0000 +++ WindowMaker/Defaults/Makefile.in -@@ -235,7 +235,7 @@ top_builddir = @top_builddir@ +@@ -314,7 +314,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ wprefs_bindir = @wprefs_bindir@ wprefs_datadir = @wprefs_datadir@ diff --git a/wm/windowmaker/patches/patch-aa b/wm/windowmaker/patches/patch-aa deleted file mode 100644 index 2c0dbd7df43..00000000000 --- a/wm/windowmaker/patches/patch-aa +++ /dev/null @@ -1,42 +0,0 @@ -$NetBSD: patch-aa,v 1.10 2013/05/21 14:38:40 hans Exp $ - ---- doc/Makefile.in.orig 2013-01-09 21:43:07.000000000 +0000 -+++ doc/Makefile.in -@@ -279,25 +279,25 @@ wprefs_bindir = @wprefs_bindir@ - wprefs_datadir = @wprefs_datadir@ - SUBDIRS = sk cs ru - man_MANS = \ -- geticonset.1x \ -- getstyle.1x \ -+ geticonset.1 \ -+ getstyle.1 \ - get-wings-flags.1 \ - get-wraster-flags.1 \ - get-wutil-flags.1 \ -- seticons.1x \ -- setstyle.1x \ -+ seticons.1 \ -+ setstyle.1 \ - upgrade-windowmaker-defaults.8 \ - wdread.1 \ -- wdwrite.1x \ -- WindowMaker.1x \ -- wmagnify.1x \ -- wmaker.1x \ -+ wdwrite.1 \ -+ WindowMaker.1 \ -+ wmagnify.1 \ -+ wmaker.1 \ - wmgenmenu.1 \ - wmmenugen.1 \ -- wmsetbg.1x \ -- WPrefs.1x \ -- wxcopy.1x \ -- wxpaste.1x -+ wmsetbg.1 \ -+ WPrefs.1 \ -+ wxcopy.1 \ -+ wxpaste.1 - - EXTRA_DIST = $(man_MANS) - all: all-recursive diff --git a/wm/windowmaker/patches/patch-ac b/wm/windowmaker/patches/patch-ac deleted file mode 100644 index df9b70e241b..00000000000 --- a/wm/windowmaker/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.8 2013/05/21 14:38:40 hans Exp $ - ---- wrlib/Makefile.in 2013-05-14 22:11:11.000000000 +0000 -+++ wrlib/Makefile.in.orig -@@ -321,7 +321,7 @@ SUBDIRS = . - AUTOMAKE_OPTIONS = - EXTRA_DIST = tests libwraster.map get-wraster-flags.in - lib_LTLIBRARIES = libwraster.la --libwraster_la_LDFLAGS = -version-info @WRASTER_VERSION@ \ -+libwraster_la_LDFLAGS = @LIBRARY_SEARCH_PATH@ @GFXLIBS@ @XLIBS@ -lm -version-info @WRASTER_VERSION@ \ - $(am__append_1) - bin_SCRIPTS = get-wraster-flags - include_HEADERS = wraster.h diff --git a/wm/windowmaker/patches/patch-ae b/wm/windowmaker/patches/patch-ae deleted file mode 100644 index 2c4f8cd5623..00000000000 --- a/wm/windowmaker/patches/patch-ae +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-ae,v 1.7 2013/05/21 14:38:40 hans Exp $ - ---- doc/sk/Makefile.in.orig 2013-01-09 21:43:07.000000000 +0000 -+++ doc/sk/Makefile.in -@@ -237,15 +237,15 @@ top_srcdir = @top_srcdir@ - wprefs_bindir = @wprefs_bindir@ - wprefs_datadir = @wprefs_datadir@ - man_MANS = \ -- geticonset.1x \ -- setstyle.1x \ -- wxpaste.1x \ -- getstyle.1x \ -- wdwrite.1x \ -- wmsetbg.1x \ -- seticons.1x \ -- wmaker.1x \ -- wxcopy.1x -+ geticonset.1 \ -+ setstyle.1 \ -+ wxpaste.1 \ -+ getstyle.1 \ -+ wdwrite.1 \ -+ wmsetbg.1 \ -+ seticons.1 \ -+ wmaker.1 \ -+ wxcopy.1 - - EXTRA_DIST = $(man_MANS) - all: all-am diff --git a/wm/windowmaker/patches/patch-ab b/wm/windowmaker/patches/patch-configure index 937677e563d..aee349c8486 100644 --- a/wm/windowmaker/patches/patch-ab +++ b/wm/windowmaker/patches/patch-configure @@ -1,10 +1,10 @@ -$NetBSD: patch-ab,v 1.15 2014/01/17 08:48:06 adam Exp $ +$NetBSD: patch-configure,v 1.1 2015/10/16 10:42:23 adam Exp $ ---- configure.orig 2013-01-09 21:43:05.000000000 +0000 +--- configure.orig 2015-08-11 18:52:18.000000000 +0000 +++ configure -@@ -11948,9 +11948,9 @@ test "x$exec_prefix" = xNONE && exec_pre - _bindir=`eval echo $bindir` - _bindir=`eval echo $_bindir` +@@ -13840,9 +13840,9 @@ _bindir=`eval echo $_bindir` + _libdir=`eval echo $libdir` + _libdir=`eval echo $_libdir` -lib_search_path='-L${libdir}' +lib_search_path="-L${BUILDLINK_DIR}/lib -L${BUILDLINK_X11_DIR}/lib" diff --git a/wm/windowmaker/patches/patch-doc_cs_Makefile.in b/wm/windowmaker/patches/patch-doc_cs_Makefile.in deleted file mode 100644 index 478dd9de057..00000000000 --- a/wm/windowmaker/patches/patch-doc_cs_Makefile.in +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-doc_cs_Makefile.in,v 1.1 2013/05/21 14:38:40 hans Exp $ - ---- doc/cs/Makefile.in.orig 2013-05-14 22:33:35.000000000 +0000 -+++ doc/cs/Makefile.in -@@ -237,15 +237,15 @@ top_srcdir = @top_srcdir@ - wprefs_bindir = @wprefs_bindir@ - wprefs_datadir = @wprefs_datadir@ - man_MANS = \ -- geticonset.1x \ -- setstyle.1x \ -- wxpaste.1x \ -- getstyle.1x \ -- wdwrite.1x \ -- wmsetbg.1x \ -- seticons.1x \ -- wmaker.1x \ -- wxcopy.1x -+ geticonset.1 \ -+ setstyle.1 \ -+ wxpaste.1 \ -+ getstyle.1 \ -+ wdwrite.1 \ -+ wmsetbg.1 \ -+ seticons.1 \ -+ wmaker.1 \ -+ wxcopy.1 - - EXTRA_DIST = $(man_MANS) - all: all-am diff --git a/wm/windowmaker/patches/patch-doc_ru_Makefile.in b/wm/windowmaker/patches/patch-doc_ru_Makefile.in deleted file mode 100644 index fac417ae820..00000000000 --- a/wm/windowmaker/patches/patch-doc_ru_Makefile.in +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-doc_ru_Makefile.in,v 1.1 2013/05/21 14:38:40 hans Exp $ - ---- doc/ru/Makefile.in.orig 2013-05-14 22:33:35.000000000 +0000 -+++ doc/ru/Makefile.in -@@ -237,15 +237,15 @@ top_srcdir = @top_srcdir@ - wprefs_bindir = @wprefs_bindir@ - wprefs_datadir = @wprefs_datadir@ - man_MANS = \ -- geticonset.1x \ -- setstyle.1x \ -- wxpaste.1x \ -- getstyle.1x \ -- wdwrite.1x \ -- wmsetbg.1x \ -- seticons.1x \ -- wmaker.1x \ -- wxcopy.1x -+ geticonset.1 \ -+ setstyle.1 \ -+ wxpaste.1 \ -+ getstyle.1 \ -+ wdwrite.1 \ -+ wmsetbg.1 \ -+ seticons.1 \ -+ wmaker.1 \ -+ wxcopy.1 - - EXTRA_DIST = $(man_MANS) - all: all-am diff --git a/wm/windowmaker/patches/patch-ad b/wm/windowmaker/patches/patch-src_main.c index b23e0b737d0..5fd827b9dd6 100644 --- a/wm/windowmaker/patches/patch-ad +++ b/wm/windowmaker/patches/patch-src_main.c @@ -1,6 +1,6 @@ -$NetBSD: patch-ad,v 1.9 2013/05/21 14:38:40 hans Exp $ +$NetBSD: patch-src_main.c,v 1.1 2015/10/16 10:42:23 adam Exp $ ---- src/main.c.orig 2013-01-09 21:42:49.000000000 +0000 +--- src/main.c.orig 2015-08-11 18:41:14.000000000 +0000 +++ src/main.c @@ -31,6 +31,7 @@ #include <sys/stat.h> @@ -10,7 +10,7 @@ $NetBSD: patch-ad,v 1.9 2013/05/21 14:38:40 hans Exp $ #include <X11/Xlib.h> #include <X11/Xutil.h> -@@ -315,6 +316,12 @@ void SetupEnvironment(WScreen * scr) +@@ -241,6 +242,12 @@ void SetupEnvironment(WScreen * scr) { char *tmp, *ptr; char buf[16]; diff --git a/wm/windowmaker/patches/patch-aj b/wm/windowmaker/patches/patch-src_switchpanel.c index 783e0ec2cf1..90fd58e8649 100644 --- a/wm/windowmaker/patches/patch-aj +++ b/wm/windowmaker/patches/patch-src_switchpanel.c @@ -1,6 +1,6 @@ -$NetBSD: patch-aj,v 1.4 2014/10/07 16:11:11 adam Exp $ +$NetBSD: patch-src_switchpanel.c,v 1.1 2015/10/16 10:42:23 adam Exp $ ---- src/switchpanel.c.orig 2014-08-30 12:29:09.000000000 +0000 +--- src/switchpanel.c.orig 2015-08-11 18:41:14.000000000 +0000 +++ src/switchpanel.c @@ -37,6 +37,8 @@ diff --git a/wm/windowmaker/patches/patch-ak b/wm/windowmaker/patches/patch-util_Makefile.in index aece7a70c9b..678d9f90c6e 100644 --- a/wm/windowmaker/patches/patch-ak +++ b/wm/windowmaker/patches/patch-util_Makefile.in @@ -1,8 +1,8 @@ -$NetBSD: patch-ak,v 1.6 2014/01/17 08:48:06 adam Exp $ +$NetBSD: patch-util_Makefile.in,v 1.1 2015/10/16 10:42:23 adam Exp $ ---- util/Makefile.in.orig 2013-09-12 22:00:17.000000000 +0000 +--- util/Makefile.in.orig 2015-08-11 18:52:20.000000000 +0000 +++ util/Makefile.in -@@ -375,21 +375,21 @@ AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\" +@@ -482,21 +482,21 @@ AM_CPPFLAGS = \ -DETCDIR=\"sysconfdir\" -DDATADIR=\"pkgdatadir\" liblist = @LIBRARY_SEARCH_PATH@ @INTLIBS@ diff --git a/wm/windowmaker/patches/patch-wrlib_Makefile.in b/wm/windowmaker/patches/patch-wrlib_Makefile.in new file mode 100644 index 00000000000..202514826f9 --- /dev/null +++ b/wm/windowmaker/patches/patch-wrlib_Makefile.in @@ -0,0 +1,13 @@ +$NetBSD: patch-wrlib_Makefile.in,v 1.1 2015/10/16 10:42:23 adam Exp $ + +--- wrlib/Makefile.in.orig 2015-08-11 18:52:20.000000000 +0000 ++++ wrlib/Makefile.in +@@ -447,7 +447,7 @@ DIST_SUBDIRS = $(SUBDIRS) tests + AUTOMAKE_OPTIONS = + EXTRA_DIST = tests + lib_LTLIBRARIES = libwraster.la +-libwraster_la_LDFLAGS = -version-info @WRASTER_VERSION@ \ ++libwraster_la_LDFLAGS = @LIBRARY_SEARCH_PATH@ @GFXLIBS@ @XLIBS@ -lm -version-info @WRASTER_VERSION@ \ + $(am__append_1) + @HAVE_LD_VERSION_SCRIPT_TRUE@EXTRA_libwraster_la_DEPENDENCIES = libwraster.map + @HAVE_LD_VERSION_SCRIPT_TRUE@CLEANFILES = libwraster.map diff --git a/wm/windowmaker/patches/patch-wrlib_load__gif.c b/wm/windowmaker/patches/patch-wrlib_load__gif.c deleted file mode 100644 index 8e4ec736ae9..00000000000 --- a/wm/windowmaker/patches/patch-wrlib_load__gif.c +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-wrlib_load__gif.c,v 1.1 2014/10/07 16:11:11 adam Exp $ - -Fix build with giflib 5.1 and newer. - ---- wrlib/load_gif.c.orig 2014-10-07 12:55:29.000000000 +0000 -+++ wrlib/load_gif.c -@@ -81,7 +81,7 @@ RImage *RLoadGIF(const char *file, int i - } - - if (gif->SWidth < 1 || gif->SHeight < 1) { -- DGifCloseFile(gif); -+ DGifCloseFile(gif, NULL); - RErrorCode = RERR_BADIMAGEFILE; - return NULL; - } -@@ -216,7 +216,7 @@ RImage *RLoadGIF(const char *file, int i - free(buffer); - - if (gif) -- DGifCloseFile(gif); -+ DGifCloseFile(gif, NULL); - - return image; - } |