Attachment #217136 for bug #248582

View | Details | Raw Unified | Return to bug 248582
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	libwraster
PORTVERSION=	0.95.9
PORTREVISION=	1
CATEGORIES=	x11-wm windowmaker
MASTER_SITES=	http://windowmaker.org/pub/source/release/
DISTNAME=	WindowMaker-${PORTVERSION}

		libjbig.so:graphics/jbigkit \
		libtiff.so:graphics/tiff \
		libwebp.so:graphics/webp \
		libMagickWand-7.so:graphics/ImageMagick7

USES=		jpeg libtool localbase pathfix pkgconfig xorg
USE_LDCONFIG=	yes

BUILD_WRKSRC=	${WRKSRC}/wrlib
INSTALL_WRKSRC=	${WRKSRC}/wrlib
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--with-pixmapdir=${PREFIX}/share/pixmaps \
		--with-localedir=${PREFIX}/share/locale \
		--with-libs-from="-L${LOCALBASE}/lib" \
		--with-incs-from="-I${LOCALBASE}/include" \

pre-build:
	cd ${WRKSRC} && ${MAKE_CMD} config-paths.h

post-install:
	cd ${WRKSRC}/doc && ${INSTALL_MAN} \
	    get-wraster-flags.1 ${STAGEDIR}${MANPREFIX}/man/man1

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)x11-wm/libwraster/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1519792748	1	TIMESTAMP = 1597080685
2	SHA256 (WindowMaker-0.95.8.tar.gz) = 9dbf5c5571bb79c4b1584f496c960ee2cd7379af45ef0f58b4b0f487259de88a	2	SHA256 (WindowMaker-0.95.9.tar.gz) = f22358ff60301670e1e2b502faad0f2da7ff8976632d538f95fe4638e9c6b714
3	SIZE (WindowMaker-0.95.8.tar.gz) = 3253515	3	SIZE (WindowMaker-0.95.9.tar.gz) = 3397167

Lines 1-6 Link Here

(-)x11-wm/libwraster/files/patch-configure (-2 / +2 lines)
1	--- configure.orig 2015-08-11 18:52:18 UTC	1	--- configure.orig 2020-04-05 13:42:01 UTC
2	+++ configure	2	+++ configure
3	@@ -13782,7 +13782,7 @@ case "$host" in #(	3	@@ -14305,7 +14305,7 @@ case "$host" in #(
4	--linux\|--cygwin\|-gnu) :	4	--linux\|--cygwin\|-gnu) :
5	WM_OSDEP="linux" ; CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=600" ;; #(	5	WM_OSDEP="linux" ; CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=600" ;; #(
6	--freebsd\|-kbsd-gnu) :	6	--freebsd\|-kbsd-gnu) :




--- wrlib/wraster.h.orig	2015-08-11 18:41:14 UTC
+++ wrlib/wraster.h
@@ -61,10 +61,14 @@
  * mechanism and define an internal macro appropriately. Please note that the macro are not considered being
  * part of the public API.
  */
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
+#ifndef __has_feature
+#define	__has_feature(x)	0
+#endif
+#ifndef __has_extension
+#define	__has_extension	__has_feature
+#endif
+#if __has_extension(attribute_depreated_with_message)
 #define __wrlib_deprecated(msg)  __attribute__ ((deprecated(msg)))
-#elif __GNUC__ >= 3
-#define __wrlib_deprecated(msg)  __attribute__ ((deprecated))
 #else
 #define __wrlib_deprecated(msg)
 #endif




--- wrlib/wraster.h.orig	2015-08-11 18:41:14 UTC
+++ wrlib/wraster.h
@@ -61,10 +61,14 @@
  * mechanism and define an internal macro appropriately. Please note that the macro are not considered being
  * part of the public API.
  */
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
+#ifndef __has_feature
+#define	__has_feature(x)	0
+#endif
+#ifndef __has_extension
+#define	__has_extension	__has_feature
+#endif
+#if __has_extension(attribute_depreated_with_message)
 #define __wrlib_deprecated(msg)  __attribute__ ((deprecated(msg)))
-#elif __GNUC__ >= 3
-#define __wrlib_deprecated(msg)  __attribute__ ((deprecated))
 #else
 #define __wrlib_deprecated(msg)
 #endif

Lines 1-4 Link Here

(-)x11-wm/libwraster/pkg-plist (-2 lines)
1	bin/get-wraster-flags
2	include/wraster.h	1	include/wraster.h
3	lib/libwraster.a	2	lib/libwraster.a
4	lib/libwraster.so	3	lib/libwraster.so
Lines 5-8 Link Here
5	lib/libwraster.so.6	4	lib/libwraster.so.6
6	lib/libwraster.so.6.0.0	5	lib/libwraster.so.6.0.0
7	libdata/pkgconfig/wrlib.pc	6	libdata/pkgconfig/wrlib.pc
8	man/man1/get-wraster-flags.1.gz




# $FreeBSD$

PORTNAME=	windowmaker
PORTVERSION=	0.95.9
PORTREVISION=	2
CATEGORIES=	x11-wm windowmaker
MASTER_SITES=	http://windowmaker.org/pub/source/release/
DISTNAME=	WindowMaker-${PORTVERSION}

		libjbig.so:graphics/jbigkit \
		libtiff.so:graphics/tiff \
		libwebp.so:graphics/webp \
		libMagickWand-7.so:graphics/ImageMagick7 \
		libwraster.so.6:x11-wm/libwraster \
		libfontconfig.so:x11-fonts/fontconfig \
		libfreetype.so:print/freetype2 \

GNU_CONFIGURE=	yes
CONFIGURE_ENV=	ac_cv_header_sys_inotify_h=no \
		wm_cv_func_secure_getenv=no
CONFIGURE_ARGS=	--with-pixmapdir=${PREFIX}/share/pixmaps \
		--localedir=${PREFIX}/share/locale \
		--with-libs-from="-L${LOCALBASE}/lib" \
		--with-incs-from="-I${LOCALBASE}/include" \

Lines 1-3 Link Here

(-)x11-wm/windowmaker/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1519793700	1	TIMESTAMP = 1589707505
2	SHA256 (WindowMaker-0.95.8.tar.gz) = 9dbf5c5571bb79c4b1584f496c960ee2cd7379af45ef0f58b4b0f487259de88a	2	SHA256 (WindowMaker-0.95.9.tar.gz) = f22358ff60301670e1e2b502faad0f2da7ff8976632d538f95fe4638e9c6b714
3	SIZE (WindowMaker-0.95.8.tar.gz) = 3253515	3	SIZE (WindowMaker-0.95.9.tar.gz) = 3397167

Lines 1-6 Link Here

(-)x11-wm/windowmaker/files/patch-Makefile.in (-2 / +2 lines)
1	--- Makefile.in.orig 2015-10-06 04:12:09 UTC	1	--- Makefile.in.orig 2020-08-10 19:15:59 UTC
2	+++ Makefile.in	2	+++ Makefile.in
3	@@ -374,7 +374,7 @@ ACLOCAL_AMFLAGS = -I m4	3	@@ -389,7 +389,7 @@ ACLOCAL_AMFLAGS = -I m4
4		4
5	# Improve coverage in 'make distcheck' by checking that translations work	5	# Improve coverage in 'make distcheck' by checking that translations work
6	AM_DISTCHECK_CONFIGURE_FLAGS = --enable-silent-rules LINGUAS='*'	6	AM_DISTCHECK_CONFIGURE_FLAGS = --enable-silent-rules LINGUAS='*'




--- WINGs/Examples/Makefile.in.orig	2020-08-10 19:15:59 UTC
+++ WINGs/Examples/Makefile.in
@@ -359,14 +359,14 @@ top_srcdir = @top_srcdir@
 wprefs_bindir = @wprefs_bindir@
 wprefs_datadir = @wprefs_datadir@
 AUTOMAKE_OPTIONS = 
-LDADD = $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
+LDADD = $(top_builddir)/WINGs/libWINGs.la -lwraster \
 	$(top_builddir)/WINGs/libWUtil.la \
 	@XFTLIBS@ @INTLIBS@ @XLIBS@
 
 colorpick_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
 fontl_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
 puzzle_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
-AM_CPPFLAGS = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
+AM_CPPFLAGS = -I$(top_srcdir)/WINGs -I$(top_srcdir)/src \
 	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@
 
 all: all-am




--- WINGs/Extras/Makefile.in.orig	2020-08-10 19:15:59 UTC
+++ WINGs/Extras/Makefile.in
@@ -155,7 +155,6 @@ am__v_lt_1 = 
 test_SOURCES = test.c
 test_OBJECTS = test.$(OBJEXT)
 am__DEPENDENCIES_1 = $(top_builddir)/WINGs/libWINGs.la \
-	$(top_builddir)/wrlib/libwraster.la \
 	$(top_builddir)/WINGs/libWUtil.la
 test_DEPENDENCIES = wtableview.o wtabledelegates.o \
 	$(am__DEPENDENCIES_1)
@@ -404,10 +403,10 @@ libExtraWINGs_la_SOURCES = \
 	wtableview.h \
 	wtabledelegates.h 
 
-AM_CPPFLAGS = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs \
+AM_CPPFLAGS = -I$(top_srcdir)/WINGs \
 	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@
 
-LDADD = $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
+LDADD = $(top_builddir)/WINGs/libWINGs.la -lwraster \
 	$(top_builddir)/WINGs/libWUtil.la \
 	@XFTLIBS@ @INTLIBS@
 




--- WINGs/Makefile.in.orig	2020-08-10 19:15:59 UTC
+++ WINGs/Makefile.in
@@ -141,8 +141,7 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
-libWINGs_la_DEPENDENCIES = libWUtil.la \
-	$(top_builddir)/wrlib/libwraster.la
+libWINGs_la_DEPENDENCIES = libWUtil.la
 am_libWINGs_la_OBJECTS = configuration.lo dragcommon.lo \
 	dragdestination.lo dragsource.lo selection.lo wappresource.lo \
 	wballoon.lo wbox.lo wbrowser.lo wbutton.lo wcolor.lo \
@@ -478,8 +477,8 @@ DIST_SUBDIRS = $(SUBDIRS) Tests Examples Extras
 libWINGs_la_LDFLAGS = -version-info @WINGS_VERSION@
 libWUtil_la_LDFLAGS = -version-info @WUTIL_VERSION@
 lib_LTLIBRARIES = libWUtil.la libWINGs.la
-LDADD = libWUtil.la libWINGs.la $(top_builddir)/wrlib/libwraster.la @INTLIBS@
-libWINGs_la_LIBADD = libWUtil.la $(top_builddir)/wrlib/libwraster.la @XLIBS@ @XFTLIBS@ @FCLIBS@ @LIBM@ @PANGOLIBS@
+LDADD = libWUtil.la libWINGs.la -lwraster @INTLIBS@
+libWINGs_la_LIBADD = libWUtil.la -lwraster @XLIBS@ @XFTLIBS@ @FCLIBS@ @LIBM@ @PANGOLIBS@
 libWUtil_la_LIBADD = @LIBBSD@
 EXTRA_DIST = BUGS make-rgb Examples Extras Tests
 
@@ -553,7 +552,8 @@ libWUtil_la_SOURCES = \
 
 AM_CFLAGS = 
 AM_CPPFLAGS = -DRESOURCE_PATH=\"$(datadir)/WINGs\" \
-	 -I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
+	 -DPREFIX=\"$(prefix)\" \
+	 -I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/src \
 	@XFTFLAGS@ @HEADER_SEARCH_PATH@
 
 pkgconfigdir = $(prefix)/libdata/pkgconfig




--- WINGs/Tests/Makefile.in.orig	2020-08-10 19:15:59 UTC
+++ WINGs/Tests/Makefile.in
@@ -118,7 +118,6 @@ am_testmywidget_OBJECTS = testmywidget.$(OBJEXT) mywid
 testmywidget_OBJECTS = $(am_testmywidget_OBJECTS)
 testmywidget_LDADD = $(LDADD)
 testmywidget_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la \
-	$(top_builddir)/wrlib/libwraster.la \
 	$(top_builddir)/WINGs/libWUtil.la
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -128,13 +127,11 @@ wmfile_SOURCES = wmfile.c
 wmfile_OBJECTS = wmfile.$(OBJEXT)
 wmfile_LDADD = $(LDADD)
 wmfile_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la \
-	$(top_builddir)/wrlib/libwraster.la \
 	$(top_builddir)/WINGs/libWUtil.la
 wmquery_SOURCES = wmquery.c
 wmquery_OBJECTS = wmquery.$(OBJEXT)
 wmquery_LDADD = $(LDADD)
 wmquery_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la \
-	$(top_builddir)/wrlib/libwraster.la \
 	$(top_builddir)/WINGs/libWUtil.la
 wtest_SOURCES = wtest.c
 wtest_OBJECTS = wtest.$(OBJEXT)
@@ -373,14 +370,14 @@ top_srcdir = @top_srcdir@
 wprefs_bindir = @wprefs_bindir@
 wprefs_datadir = @wprefs_datadir@
 AUTOMAKE_OPTIONS = 
-LDADD = $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
+LDADD = $(top_builddir)/WINGs/libWINGs.la -lwraster \
 	$(top_builddir)/WINGs/libWUtil.la \
 	@XFTLIBS@ @INTLIBS@ @XLIBS@ 
 
 testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h 
 wtest_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
 EXTRA_DIST = logo.xpm upbtn.xpm wm.html wm.png
-AM_CPPFLAGS = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
+AM_CPPFLAGS = -I$(top_srcdir)/WINGs -I$(top_srcdir)/src \
 	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @XFTFLAGS@ @HEADER_SEARCH_PATH@
 
 all: all-am




--- WINGs/WINGs/WINGsP.h.orig	2019-02-15 23:34:25 UTC
+++ WINGs/WINGs/WINGsP.h
@@ -17,7 +17,13 @@
 
 #include <assert.h>
 
+#ifdef _XLOCALE_H_	/* workaround for libX11<1.4 */
+#undef _XLOCALE_H_
 #include <stdlib.h>
+#define _XLOCALE_H_
+#else
+#include <stdlib.h>
+#endif
 #include <string.h>
 #include <strings.h>
 #include <stdio.h>




--- WINGs/Examples/Makefile.in.orig	2015-10-06 04:12:10 UTC
+++ WINGs/Examples/Makefile.in
@@ -342,14 +342,14 @@ top_srcdir = @top_srcdir@
 wprefs_bindir = @wprefs_bindir@
 wprefs_datadir = @wprefs_datadir@
 AUTOMAKE_OPTIONS = 
-LDADD = $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
+LDADD = $(top_builddir)/WINGs/libWINGs.la -lwraster \
 	$(top_builddir)/WINGs/libWUtil.la \
 	@XFTLIBS@ @INTLIBS@ @XLIBS@
 
 colorpick_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
 fontl_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
 puzzle_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
-AM_CPPFLAGS = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
+AM_CPPFLAGS = -I$(top_srcdir)/WINGs -I$(top_srcdir)/src \
 	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@
 
 all: all-am




--- WINGs/Extras/Makefile.in.orig	2015-10-06 04:12:10 UTC
+++ WINGs/Extras/Makefile.in
@@ -145,7 +145,6 @@ PROGRAMS = $(noinst_PROGRAMS)
 test_SOURCES = test.c
 test_OBJECTS = test.$(OBJEXT)
 am__DEPENDENCIES_1 = $(top_builddir)/WINGs/libWINGs.la \
-	$(top_builddir)/wrlib/libwraster.la \
 	$(top_builddir)/WINGs/libWUtil.la
 test_DEPENDENCIES = wtableview.o wtabledelegates.o \
 	$(am__DEPENDENCIES_1)
@@ -386,10 +385,10 @@ libExtraWINGs_la_SOURCES = \
 	wtableview.h \
 	wtabledelegates.h 
 
-AM_CPPFLAGS = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs \
+AM_CPPFLAGS = -I$(top_srcdir)/WINGs \
 	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@
 
-LDADD = $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
+LDADD = $(top_builddir)/WINGs/libWINGs.la -lwraster \
 	$(top_builddir)/WINGs/libWUtil.la \
 	@XFTLIBS@ @INTLIBS@
 




--- WINGs/Makefile.in.orig	2015-10-06 04:12:10 UTC
+++ WINGs/Makefile.in
@@ -135,8 +135,7 @@ am__uninstall_files_from_dir = { \
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
 	"$(DESTDIR)$(pkgconfigdir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
-libWINGs_la_DEPENDENCIES = libWUtil.la \
-	$(top_builddir)/wrlib/libwraster.la
+libWINGs_la_DEPENDENCIES = libWUtil.la
 am_libWINGs_la_OBJECTS = configuration.lo dragcommon.lo \
 	dragdestination.lo dragsource.lo selection.lo wappresource.lo \
 	wballoon.lo wbox.lo wbrowser.lo wbutton.lo wcolor.lo \
@@ -438,8 +437,8 @@ libWINGs_la_LDFLAGS = -version-info @WIN
 libWUtil_la_LDFLAGS = -version-info @WUTIL_VERSION@
 dist_bin_SCRIPTS = get-wings-flags get-wutil-flags
 lib_LTLIBRARIES = libWUtil.la libWINGs.la
-LDADD = libWUtil.la libWINGs.la $(top_builddir)/wrlib/libwraster.la @INTLIBS@
-libWINGs_la_LIBADD = libWUtil.la $(top_builddir)/wrlib/libwraster.la @XLIBS@ @XFTLIBS@ @FCLIBS@ @LIBM@ @PANGOLIBS@
+LDADD = libWUtil.la libWINGs.la -lwraster @INTLIBS@
+libWINGs_la_LIBADD = libWUtil.la -lwraster @XLIBS@ @XFTLIBS@ @FCLIBS@ @LIBM@ @PANGOLIBS@
 libWUtil_la_LIBADD = @LIBBSD@
 EXTRA_DIST = BUGS make-rgb Examples Extras Tests
 
@@ -513,7 +512,8 @@ libWUtil_la_SOURCES = \
 
 AM_CFLAGS = 
 AM_CPPFLAGS = -DRESOURCE_PATH=\"$(datadir)/WINGs\" \
-	 -I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
+	 -DPREFIX=\"$(prefix)\" \
+	 -I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/src \
 	@XFTFLAGS@ @HEADER_SEARCH_PATH@
 
 pkgconfigdir = $(prefix)/libdata/pkgconfig




--- WINGs/Tests/Makefile.in.orig	2015-10-06 04:12:10 UTC
+++ WINGs/Tests/Makefile.in
@@ -109,7 +109,6 @@ am_testmywidget_OBJECTS = testmywidget.$
 testmywidget_OBJECTS = $(am_testmywidget_OBJECTS)
 testmywidget_LDADD = $(LDADD)
 testmywidget_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la \
-	$(top_builddir)/wrlib/libwraster.la \
 	$(top_builddir)/WINGs/libWUtil.la
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -119,13 +118,11 @@ wmfile_SOURCES = wmfile.c
 wmfile_OBJECTS = wmfile.$(OBJEXT)
 wmfile_LDADD = $(LDADD)
 wmfile_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la \
-	$(top_builddir)/wrlib/libwraster.la \
 	$(top_builddir)/WINGs/libWUtil.la
 wmquery_SOURCES = wmquery.c
 wmquery_OBJECTS = wmquery.$(OBJEXT)
 wmquery_LDADD = $(LDADD)
 wmquery_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la \
-	$(top_builddir)/wrlib/libwraster.la \
 	$(top_builddir)/WINGs/libWUtil.la
 wtest_SOURCES = wtest.c
 wtest_OBJECTS = wtest.$(OBJEXT)
@@ -355,14 +352,14 @@ top_srcdir = @top_srcdir@
 wprefs_bindir = @wprefs_bindir@
 wprefs_datadir = @wprefs_datadir@
 AUTOMAKE_OPTIONS = 
-LDADD = $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
+LDADD = $(top_builddir)/WINGs/libWINGs.la -lwraster \
 	$(top_builddir)/WINGs/libWUtil.la \
 	@XFTLIBS@ @INTLIBS@ @XLIBS@ 
 
 testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h 
 wtest_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
 EXTRA_DIST = logo.xpm upbtn.xpm wm.html wm.png
-AM_CPPFLAGS = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
+AM_CPPFLAGS = -I$(top_srcdir)/WINGs -I$(top_srcdir)/src \
 	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @XFTFLAGS@ @HEADER_SEARCH_PATH@
 
 all: all-am




--- WINGs/WINGs/WINGsP.h.orig	2015-08-11 18:41:14 UTC
+++ WINGs/WINGs/WINGsP.h
@@ -17,7 +17,13 @@
 
 #include <assert.h>
 
+#ifdef _XLOCALE_H_	/* workaround for libX11<1.4 */
+#undef _XLOCALE_H_
+#include <stdlib.h>
+#define _XLOCALE_H_
+#else
 #include <stdlib.h>
+#endif
 #include <string.h>
 #include <strings.h>
 #include <stdio.h>

Lines 1-11 Link Here

(-)x11-wm/windowmaker/files/patch-WINGs__wapplication.c (-11 lines)
1	--- WINGs/wapplication.c.orig 2015-08-11 18:41:14 UTC
2	+++ WINGs/wapplication.c
3	@@ -187,7 +187,7 @@ char *WMPathForResourceOfType(const char
4	if (path)
5	goto out;
6
7	- path = checkFile("/usr/local/GNUstep", appdir, ext, resource);
8	+ path = checkFile(PREFIX "/GNUstep", appdir, ext, resource);
9	if (path)
10	goto out;
11

Line 0 Link Here

(-)x11-wm/windowmaker/files/patch-WINGs_wapplication.c (+11 lines)
	1	--- WINGs/wapplication.c.orig 2020-04-05 13:41:15 UTC
	2	+++ WINGs/wapplication.c
	3	@@ -187,7 +187,7 @@ char WMPathForResourceOfType(const char resource, co
	4	if (path)
	5	goto out;
	6
	7	- path = checkFile("/usr/local/GNUstep", appdir, ext, resource);
	8	+ path = checkFile(PREFIX "/GNUstep", appdir, ext, resource);
	9	if (path)
	10	goto out;
	11




--- WPrefs.app/Makefile.in.orig	2020-08-10 19:15:59 UTC
+++ WPrefs.app/Makefile.in
@@ -481,13 +481,14 @@ WPrefs_SOURCES = \
 #	Themes.c
 AM_CFLAGS = 
 AM_CPPFLAGS = -DRESOURCE_PATH=\"$(wpdatadir)\" -DWMAKER_RESOURCE_PATH=\"$(pkgdatadir)\" \
-	 -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@ 
+	 -DPREFIX=\"$(prefix)\" \
+	 -I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@ 
 
 WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
 WPrefs_LDADD = \
 	$(top_builddir)/WINGs/libWINGs.la\
 	$(top_builddir)/WINGs/libWUtil.la\
-	$(top_builddir)/wrlib/libwraster.la \
+	-lwraster \
 	@XLFLAGS@ @XLIBS@ \
 	@LIBM@ \
 	@FCLIBS@ \




--- WPrefs.app/Menu.c.orig	2020-04-05 13:41:15 UTC
+++ WPrefs.app/Menu.c
@@ -518,19 +518,19 @@ static void createPanel(_Panel * p)
 		data = putNewItem(panel, pad, DirectoryInfo, _("Themes"));
 		data->param.directory.command = "setstyle";
 		data->param.directory.directory =
-		    "/usr/share/WindowMaker/Themes /usr/local/share/WindowMaker/Themes $HOME/GNUstep/Library/WindowMaker/Themes";
+		    "/usr/share/WindowMaker/Themes " PREFIX "/share/WindowMaker/Themes $HOME/GNUstep/Library/WindowMaker/Themes";
 		data->param.directory.stripExt = 1;
 
 		data = putNewItem(panel, pad, DirectoryInfo, _("Bg Images (scale)"));
 		data->param.directory.command = "wmsetbg -u -s";
 		data->param.directory.directory =
-		    "/opt/kde2/share/wallpapers /usr/share/WindowMaker/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds";
+		    "/opt/kde2/share/wallpapers " PREFIX "/share/WindowMaker/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds";
 		data->param.directory.stripExt = 1;
 
 		data = putNewItem(panel, pad, DirectoryInfo, _("Bg Images (tile)"));
 		data->param.directory.command = "wmsetbg -u -t";
 		data->param.directory.directory =
-		    "/opt/kde2/share/wallpapers /usr/share/WindowMaker/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds";
+		    "/opt/kde2/share/wallpapers " PREFIX "/share/WindowMaker/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds";
 		data->param.directory.stripExt = 1;
 
 		smenu = putNewSubmenu(pad, _("Assorted XTerms"));




--- WPrefs.app/Paths.c.orig	2019-02-15 23:34:25 UTC
+++ WPrefs.app/Paths.c
@@ -78,9 +78,9 @@ static void showData(_Panel * panel)
 			wwarning(_("bad value in option IconPath. Using default path list"));
 		addPathToList(panel->icoL, -1, "~/pixmaps");
 		addPathToList(panel->icoL, -1, "~/GNUstep/Library/Icons");
-		addPathToList(panel->icoL, -1, "/usr/include/X11/pixmaps");
-		addPathToList(panel->icoL, -1, "/usr/local/share/WindowMaker/Icons");
-		addPathToList(panel->icoL, -1, "/usr/local/share/WindowMaker/Pixmaps");
+		addPathToList(panel->icoL, -1, PREFIX "/share/pixmaps");
+		addPathToList(panel->icoL, -1, PREFIX "/share/WindowMaker/Icons");
+		addPathToList(panel->icoL, -1, PREFIX "/share/WindowMaker/Pixmaps");
 		addPathToList(panel->icoL, -1, "/usr/share/WindowMaker/Icons");
 	} else {
 		for (i = 0; i < WMGetPropListItemCount(array); i++) {
@@ -95,7 +95,7 @@ static void showData(_Panel * panel)
 			wwarning(_("bad value in option PixmapPath. Using default path list"));
 		addPathToList(panel->pixL, -1, "~/pixmaps");
 		addPathToList(panel->pixL, -1, "~/GNUstep/Library/WindowMaker/Pixmaps");
-		addPathToList(panel->pixL, -1, "/usr/local/share/WindowMaker/Pixmaps");
+		addPathToList(panel->pixL, -1, PREFIX "/share/WindowMaker/Pixmaps");
 	} else {
 		for (i = 0; i < WMGetPropListItemCount(array); i++) {
 			val = WMGetFromPLArray(array, i);




--- WPrefs.app/Makefile.in.orig	2015-10-06 04:12:10 UTC
+++ WPrefs.app/Makefile.in
@@ -455,13 +455,14 @@ WPrefs_SOURCES = \
 #	Themes.c
 AM_CFLAGS = 
 AM_CPPFLAGS = -DRESOURCE_PATH=\"$(wpdatadir)\" -DWMAKER_RESOURCE_PATH=\"$(pkgdatadir)\" \
-	 -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@ 
+	 -DPREFIX=\"$(prefix)\" \
+	 -I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@ 
 
 WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
 WPrefs_LDADD = \
 	$(top_builddir)/WINGs/libWINGs.la\
 	$(top_builddir)/WINGs/libWUtil.la\
-	$(top_builddir)/wrlib/libwraster.la \
+	-lwraster \
 	@XLFLAGS@ @XLIBS@ \
 	@LIBM@ \
 	@FCLIBS@ \




--- WPrefs.app/Menu.c.orig	2015-08-11 18:41:14 UTC
+++ WPrefs.app/Menu.c
@@ -517,19 +517,19 @@ static void createPanel(_Panel * p)
 		data = putNewItem(panel, pad, DirectoryInfo, _("Themes"));
 		data->param.directory.command = "setstyle";
 		data->param.directory.directory =
-		    "/usr/share/WindowMaker/Themes /usr/local/share/WindowMaker/Themes $HOME/GNUstep/Library/WindowMaker/Themes";
+		    "/usr/share/WindowMaker/Themes " PREFIX "/share/WindowMaker/Themes $HOME/GNUstep/Library/WindowMaker/Themes";
 		data->param.directory.stripExt = 1;
 
 		data = putNewItem(panel, pad, DirectoryInfo, _("Bg Images (scale)"));
 		data->param.directory.command = "wmsetbg -u -s";
 		data->param.directory.directory =
-		    "/opt/kde2/share/wallpapers /usr/share/WindowMaker/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds";
+		    "/opt/kde2/share/wallpapers " PREFIX "/share/WindowMaker/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds";
 		data->param.directory.stripExt = 1;
 
 		data = putNewItem(panel, pad, DirectoryInfo, _("Bg Images (tile)"));
 		data->param.directory.command = "wmsetbg -u -t";
 		data->param.directory.directory =
-		    "/opt/kde2/share/wallpapers /usr/share/WindowMaker/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds";
+		    "/opt/kde2/share/wallpapers " PREFIX "/share/WindowMaker/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds";
 		data->param.directory.stripExt = 1;
 
 		smenu = putNewSubmenu(pad, _("Assorted XTerms"));




--- WPrefs.app/Paths.c.orig	2015-08-11 18:41:14 UTC
+++ WPrefs.app/Paths.c
@@ -78,9 +78,9 @@ static void showData(_Panel * panel)
 			wwarning(_("bad value in option IconPath. Using default path list"));
 		addPathToList(panel->icoL, -1, "~/pixmaps");
 		addPathToList(panel->icoL, -1, "~/GNUstep/Library/Icons");
-		addPathToList(panel->icoL, -1, "/usr/include/X11/pixmaps");
-		addPathToList(panel->icoL, -1, "/usr/local/share/WindowMaker/Icons");
-		addPathToList(panel->icoL, -1, "/usr/local/share/WindowMaker/Pixmaps");
+		addPathToList(panel->icoL, -1, PREFIX "/share/pixmaps");
+		addPathToList(panel->icoL, -1, PREFIX "/share/WindowMaker/Icons");
+		addPathToList(panel->icoL, -1, PREFIX "/share/WindowMaker/Pixmaps");
 		addPathToList(panel->icoL, -1, "/usr/share/WindowMaker/Icons");
 	} else {
 		for (i = 0; i < WMGetPropListItemCount(array); i++) {
@@ -95,7 +95,7 @@ static void showData(_Panel * panel)
 			wwarning(_("bad value in option PixmapPath. Using default path list"));
 		addPathToList(panel->pixL, -1, "~/pixmaps");
 		addPathToList(panel->pixL, -1, "~/GNUstep/Library/WindowMaker/Pixmaps");
-		addPathToList(panel->pixL, -1, "/usr/local/share/WindowMaker/Pixmaps");
+		addPathToList(panel->pixL, -1, PREFIX "/share/WindowMaker/Pixmaps");
 	} else {
 		for (i = 0; i < WMGetPropListItemCount(array); i++) {
 			val = WMGetFromPLArray(array, i);




--- WindowMaker/Defaults/Makefile.in.orig	2015-10-06 04:12:10 UTC
+++ WindowMaker/Defaults/Makefile.in
@@ -542,7 +542,9 @@ WMWindowAttributes: $(srcdir)/WMWindowAt
 	chmod 644 WMWindowAttributes
 
 WindowMaker: $(srcdir)/WindowMaker.in
-	$(AM_V_GEN)sed -e "s:#pkgdatadir#:$(pkgdatadir):" $(srcdir)/WindowMaker.in \
+	$(AM_V_GEN)sed -e "s:#pkgdatadir#:$(pkgdatadir):" \
+		-e "s:#prefix#:$(prefix):" \
+		$(srcdir)/WindowMaker.in \
 		> WindowMaker ; \
 	chmod 644 WindowMaker
 




--- WindowMaker/Defaults/WindowMaker.in.orig	2015-08-11 18:41:14 UTC
+++ WindowMaker/Defaults/WindowMaker.in
@@ -13,12 +13,10 @@
     "~/GNUstep/Library/Icons",
     "#pkgdatadir#/Icons",
     "#pkgdatadir#/Pixmaps",
-    "/usr/include/X11/pixmaps",
     "~/GNUstep/Library/WindowMaker/Pixmaps",
     "~/GNUstep/Library/WindowMaker/CachedPixmaps",
-    "/usr/share/icons",
-    "/usr/local/share/pixmaps",
-    "/usr/share/pixmaps"
+    "#prefix#/share/icons",
+    "#prefix#/share/pixmaps"
   );
   PixmapPath = (
     "~/GNUstep/Library/WindowMaker/Pixmaps",
@@ -26,9 +24,7 @@
     "~/GNUstep/Library/WindowMaker/CachedPixmaps",
     "#pkgdatadir#/Pixmaps",
     "#pkgdatadir#/Backgrounds",
-    "/usr/include/X11/pixmaps",
-    "/usr/local/share/pixmaps",
-    "/usr/share/pixmaps"
+    "#prefix#/share/pixmaps"
   );
   WindowTitleBalloons = YES;
   IconSize = 64;

Line 0 Link Here

(-)x11-wm/windowmaker/files/patch-WindowMaker_Defaults_Makefile.in (+10 lines)
	1	--- WindowMaker/Defaults/Makefile.in.orig 2020-08-10 19:15:59 UTC
	2	+++ WindowMaker/Defaults/Makefile.in
	3	@@ -562,6 +562,7 @@ WMWindowAttributes: $(srcdir)/WMWindowAttributes.in
	4
	5	WindowMaker: $(srcdir)/WindowMaker.in
	6	$(AM_V_GEN)sed -e "s:#pkgdatadir#:$(pkgdatadir):" \
	7	+ -e "s:#prefix#:$(prefix):" \
	8	-e "s:#pixmapdir#:$(pixmapdir):" $(srcdir)/WindowMaker.in \
	9	> WindowMaker ; \
	10	chmod 644 WindowMaker

Line 0 Link Here

(-)x11-wm/windowmaker/files/patch-WindowMaker_Defaults_WindowMaker.in (+10 lines)
	1	--- WindowMaker/Defaults/WindowMaker.in.orig 2020-04-05 13:41:16 UTC
	2	+++ WindowMaker/Defaults/WindowMaker.in
	3	@@ -37,6 +37,7 @@
	4	"~/pixmaps",
	5	"#pkgdatadir#/Icons",
	6	"#pkgdatadir#/Pixmaps",
	7	+ "#prefix#/share/icons",
	8	"#pixmapdir#"
	9	);
	10	ColormapMode = auto;

Lines 1-6 Link Here

(-)x11-wm/windowmaker/files/patch-configure (-2 / +2 lines)
1	--- configure.orig 2015-08-11 18:52:18 UTC	1	--- configure.orig 2020-04-05 13:42:01 UTC
2	+++ configure	2	+++ configure
3	@@ -13782,7 +13782,7 @@ case "$host" in #(	3	@@ -14305,7 +14305,7 @@ case "$host" in #(
4	--linux\|--cygwin\|-gnu) :	4	--linux\|--cygwin\|-gnu) :
5	WM_OSDEP="linux" ; CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=600" ;; #(	5	WM_OSDEP="linux" ; CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=600" ;; #(
6	--freebsd\|-kbsd-gnu) :	6	--freebsd\|-kbsd-gnu) :

Lines 1-10 Link Here

(-)x11-wm/windowmaker/files/patch-doc__Makefile.in (-10 lines)
1	--- doc/Makefile.in.orig 2015-10-06 04:12:09 UTC
2	+++ doc/Makefile.in
3	@@ -382,7 +382,6 @@ dist_man_MANS = \
4	geticonset.1 \
5	getstyle.1 \
6	get-wings-flags.1 \
7	- get-wraster-flags.1 \
8	get-wutil-flags.1 \
9	seticons.1 \
10	setstyle.1 \




--- src/Makefile.in.orig	2020-08-10 19:15:59 UTC
+++ src/Makefile.in
@@ -173,8 +173,7 @@ am_wmaker_OBJECTS = actions.$(OBJEXT) appicon.$(OBJEXT
 @USE_NESTED_FUNC_FALSE@	xmodifier.hack_nf.$(OBJEXT)
 wmaker_OBJECTS = $(am_wmaker_OBJECTS) $(nodist_wmaker_OBJECTS)
 wmaker_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la \
-	$(top_builddir)/WINGs/libWUtil.la \
-	$(top_builddir)/wrlib/libwraster.la
+	$(top_builddir)/WINGs/libWUtil.la
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
@@ -467,13 +466,12 @@ wmaker_SOURCES = GNUstep.h WindowMaker.h actions.c act
 @USE_NESTED_FUNC_FALSE@CLEANFILES = $(nodist_wmaker_SOURCES)
 AM_CFLAGS = 
 AM_CPPFLAGS = $(DFLAGS) \
-	-I$(top_srcdir)/wrlib \
 	-I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@ 
 
 wmaker_LDADD = \
 	$(top_builddir)/WINGs/libWINGs.la\
 	$(top_builddir)/WINGs/libWUtil.la\
-	$(top_builddir)/wrlib/libwraster.la\
+	-lwraster \
 	@XLFLAGS@ \
 	@LIBXRANDR@ \
 	@LIBXINERAMA@ \




--- src/Makefile.in.orig	2015-10-06 04:12:09 UTC
+++ src/Makefile.in
@@ -164,8 +164,7 @@ am_wmaker_OBJECTS = actions.$(OBJEXT) ap
 @USE_NESTED_FUNC_FALSE@	xmodifier.hack_nf.$(OBJEXT)
 wmaker_OBJECTS = $(am_wmaker_OBJECTS) $(nodist_wmaker_OBJECTS)
 wmaker_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la \
-	$(top_builddir)/WINGs/libWUtil.la \
-	$(top_builddir)/wrlib/libwraster.la
+	$(top_builddir)/WINGs/libWUtil.la
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
@@ -424,13 +423,12 @@ wmaker_SOURCES = GNUstep.h WindowMaker.h
 @USE_NESTED_FUNC_FALSE@CLEANFILES = $(nodist_wmaker_SOURCES)
 AM_CFLAGS = 
 AM_CPPFLAGS = $(DFLAGS) \
-	-I$(top_srcdir)/wrlib \
 	-I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@ 
 
 wmaker_LDADD = \
 	$(top_builddir)/WINGs/libWINGs.la\
 	$(top_builddir)/WINGs/libWUtil.la\
-	$(top_builddir)/wrlib/libwraster.la\
+	-lwraster \
 	@XLFLAGS@ \
 	@LIBXRANDR@ \
 	@LIBXINERAMA@ \

Lines 1-11 Link Here

(-)x11-wm/windowmaker/files/patch-src__startup.c (-11 lines)
1	--- src/startup.c.orig 2015-08-11 18:41:14 UTC
2	+++ src/startup.c
3	@@ -666,7 +666,7 @@ void StartUp(Bool defaultScreenOnly)
4	wMenuRestoreState(wScreen[j]);
5
6	/* If we're not restarting, restore session */
7	- if (wPreferences.flags.restarting == 0 && !wPreferences.flags.norestore)
8	+ if (!wPreferences.flags.restarting && !wPreferences.flags.norestore)
9	wSessionRestoreState(wScreen[j]);
10
11	if (!wPreferences.flags.noautolaunch) {

Line 0 Link Here

(-)x11-wm/windowmaker/files/patch-src_startup.c (+11 lines)
	1	--- src/startup.c.orig 2019-02-15 23:34:26 UTC
	2	+++ src/startup.c
	3	@@ -666,7 +666,7 @@ void StartUp(Bool defaultScreenOnly)
	4	wMenuRestoreState(wScreen[j]);
	5
	6	/* If we're not restarting, restore session */
	7	- if (wPreferences.flags.restarting == 0 && !wPreferences.flags.norestore)
	8	+ if (!wPreferences.flags.restarting && !wPreferences.flags.norestore)
	9	wSessionRestoreState(wScreen[j]);
	10
	11	if (!wPreferences.flags.noautolaunch) {




--- util/Makefile.in.orig	2020-08-10 19:15:59 UTC
+++ util/Makefile.in
@@ -154,14 +154,13 @@ wdwrite_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.
 wmagnify_SOURCES = wmagnify.c
 wmagnify_OBJECTS = wmagnify.$(OBJEXT)
 wmagnify_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la \
-	$(top_builddir)/WINGs/libWUtil.la \
-	$(top_builddir)/wrlib/libwraster.la
+	$(top_builddir)/WINGs/libWUtil.la
 am_wmgenmenu_OBJECTS = wmgenmenu.$(OBJEXT)
 wmgenmenu_OBJECTS = $(am_wmgenmenu_OBJECTS)
 wmgenmenu_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.la
 am_wmiv_OBJECTS = wmiv.$(OBJEXT)
 wmiv_OBJECTS = $(am_wmiv_OBJECTS)
-wmiv_DEPENDENCIES = $(top_builddir)/wrlib/libwraster.la \
+wmiv_DEPENDENCIES = \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
 am_wmmenugen_OBJECTS = wmmenugen.$(OBJEXT) wmmenugen_misc.$(OBJEXT) \
@@ -172,8 +171,7 @@ wmmenugen_DEPENDENCIES = $(top_builddir)/WINGs/libWUti
 wmsetbg_SOURCES = wmsetbg.c
 wmsetbg_OBJECTS = wmsetbg.$(OBJEXT)
 wmsetbg_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la \
-	$(top_builddir)/WINGs/libWUtil.la \
-	$(top_builddir)/wrlib/libwraster.la
+	$(top_builddir)/WINGs/libWUtil.la
 wxcopy_SOURCES = wxcopy.c
 wxcopy_OBJECTS = wxcopy.$(OBJEXT)
 wxcopy_DEPENDENCIES =
@@ -502,7 +500,7 @@ AUTOMAKE_OPTIONS = 
 bin_SCRIPTS = wmaker.inst wm-oldmenu2new wkdemenu.pl
 EXTRA_DIST = wmaker.inst.in bughint wm-oldmenu2new wkdemenu.pl
 AM_CPPFLAGS = \
-	 $(DFLAGS) -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib \
+	 $(DFLAGS) -I$(top_srcdir)/WINGs \
 	@HEADER_SEARCH_PATH@ \
 	-DETCDIR=\"sysconfdir\" -DDATADIR=\"pkgdatadir\"
 
@@ -525,13 +523,13 @@ geticonset_LDADD = $(top_builddir)/WINGs/libWUtil.la $
 wmagnify_LDADD = \
 	$(top_builddir)/WINGs/libWINGs.la \
 	$(top_builddir)/WINGs/libWUtil.la \
-	$(top_builddir)/wrlib/libwraster.la \
+	-lwraster \
 	@XLFLAGS@ @XLIBS@ @INTLIBS@
 
 wmsetbg_LDADD = \
 	$(top_builddir)/WINGs/libWINGs.la \
 	$(top_builddir)/WINGs/libWUtil.la \
-	$(top_builddir)/wrlib/libwraster.la \
+	-lwraster \
 	@XLFLAGS@ @LIBXINERAMA@ @XLIBS@ @INTLIBS@
 
 wmgenmenu_LDADD = \
@@ -548,7 +546,7 @@ wmmenugen_SOURCES = wmmenugen.c wmmenugen.h wmmenugen_
 	wmmenugen_parse_xdg.c
 
 wmiv_LDADD = \
-	$(top_builddir)/wrlib/libwraster.la \
+	-lwraster \
 	@XLFLAGS@ @XLIBS@ \
 	@GFXLIBS@ $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(LIBEXIF)
 




--- util/Makefile.in.orig	2015-10-06 04:12:09 UTC
+++ util/Makefile.in
@@ -145,14 +145,13 @@ wdwrite_DEPENDENCIES = $(top_builddir)/W
 wmagnify_SOURCES = wmagnify.c
 wmagnify_OBJECTS = wmagnify.$(OBJEXT)
 wmagnify_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la \
-	$(top_builddir)/WINGs/libWUtil.la \
-	$(top_builddir)/wrlib/libwraster.la
+	$(top_builddir)/WINGs/libWUtil.la
 am_wmgenmenu_OBJECTS = wmgenmenu.$(OBJEXT)
 wmgenmenu_OBJECTS = $(am_wmgenmenu_OBJECTS)
 wmgenmenu_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.la
 am_wmiv_OBJECTS = wmiv.$(OBJEXT)
 wmiv_OBJECTS = $(am_wmiv_OBJECTS)
-wmiv_DEPENDENCIES = $(top_builddir)/wrlib/libwraster.la \
+wmiv_DEPENDENCIES = \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
 am_wmmenugen_OBJECTS = wmmenugen.$(OBJEXT) wmmenugen_misc.$(OBJEXT) \
@@ -163,8 +162,7 @@ wmmenugen_DEPENDENCIES = $(top_builddir)
 wmsetbg_SOURCES = wmsetbg.c
 wmsetbg_OBJECTS = wmsetbg.$(OBJEXT)
 wmsetbg_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la \
-	$(top_builddir)/WINGs/libWUtil.la \
-	$(top_builddir)/wrlib/libwraster.la
+	$(top_builddir)/WINGs/libWUtil.la
 wxcopy_SOURCES = wxcopy.c
 wxcopy_OBJECTS = wxcopy.$(OBJEXT)
 wxcopy_DEPENDENCIES =
@@ -477,7 +475,7 @@ AUTOMAKE_OPTIONS = 
 bin_SCRIPTS = wmaker.inst wm-oldmenu2new wkdemenu.pl
 EXTRA_DIST = wmaker.inst.in bughint wm-oldmenu2new wkdemenu.pl
 AM_CPPFLAGS = \
-	 $(DFLAGS) -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib \
+	 $(DFLAGS) -I$(top_srcdir)/WINGs \
 	@HEADER_SEARCH_PATH@ \
 	-DETCDIR=\"sysconfdir\" -DDATADIR=\"pkgdatadir\"
 
@@ -500,13 +498,13 @@ geticonset_LDADD = $(top_builddir)/WINGs
 wmagnify_LDADD = \
 	$(top_builddir)/WINGs/libWINGs.la \
 	$(top_builddir)/WINGs/libWUtil.la \
-	$(top_builddir)/wrlib/libwraster.la \
+	-lwraster \
 	@XLFLAGS@ @XLIBS@ @INTLIBS@
 
 wmsetbg_LDADD = \
 	$(top_builddir)/WINGs/libWINGs.la \
 	$(top_builddir)/WINGs/libWUtil.la \
-	$(top_builddir)/wrlib/libwraster.la \
+	-lwraster \
 	@XLFLAGS@ @LIBXINERAMA@ @XLIBS@ @INTLIBS@
 
 wmgenmenu_LDADD = \
@@ -523,7 +521,7 @@ wmmenugen_SOURCES = wmmenugen.c wmmenuge
 	wmmenugen_parse_xdg.c
 
 wmiv_LDADD = \
-	$(top_builddir)/wrlib/libwraster.la \
+	-lwraster \
 	@XLFLAGS@ @XLIBS@ \
 	@GFXLIBS@ $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(LIBEXIF)
 




--- util/wmiv.c.orig	2015-08-11 18:41:14 UTC
+++ util/wmiv.c
@@ -28,7 +28,9 @@
 #include <X11/Xlib.h>
 #include "wraster.h"
 #include <stdlib.h>
+#define	__BSD_VISIBLE	1
 #include <stdio.h>
+#undef __BSD_VISIBLE
 #include <string.h>
 #include <dirent.h>
 #include <limits.h>




--- util/wmiv.c.orig	2020-04-05 13:41:16 UTC
+++ util/wmiv.c
@@ -28,7 +28,9 @@
 #include <X11/Xlib.h>
 #include "wraster.h"
 #include <stdlib.h>
+#define	__BSD_VISIBLE	1
 #include <stdio.h>
+#undef __BSD_VISIBLE
 #include <string.h>
 #include <dirent.h>
 #include <limits.h>




GNUstep/Applications/WPrefs.app/tiff/workspacename.tiff
GNUstep/Applications/WPrefs.app/tiff/xis.tiff
bin/convertfonts
bin/get-wings-flags
bin/get-wutil-flags
bin/geticonset
bin/getstyle
bin/seticons

share/WindowMaker/Pixmaps/tile.xpm
share/WindowMaker/README
share/WindowMaker/README.themes
share/WindowMaker/Styles/Adwaita.style
share/WindowMaker/Styles/Autumn.style
share/WindowMaker/Styles/Black.style
share/WindowMaker/Styles/BlackTexture.style

share/WindowMaker/Themes/Pastel.style
share/WindowMaker/Themes/SteelBlueSilk.style
share/WindowMaker/appearance.menu
share/WindowMaker/appearance.menu.fy
share/WindowMaker/appearance.menu.nl
share/WindowMaker/background.menu.fy
share/WindowMaker/background.menu.nl
share/WindowMaker/autostart.sh
share/WindowMaker/background.menu
share/WindowMaker/exitscript.sh

%%NLS%%man/cs/man1/wxpaste.1.gz
man/man1/WPrefs.1.gz
man/man1/WindowMaker.1.gz
man/man1/get-wings-flags.1.gz
man/man1/get-wutil-flags.1.gz
man/man1/geticonset.1.gz
man/man1/getstyle.1.gz
man/man1/seticons.1.gz

man/man1/wmsetbg.1.gz
man/man1/wxcopy.1.gz
man/man1/wxpaste.1.gz
man/man8/upgrade-windowmaker-defaults.8.gz
%%NLS%%man/ru/man1/geticonset.1.gz
%%NLS%%man/ru/man1/getstyle.1.gz
%%NLS%%man/ru/man1/seticons.1.gz

Return to bug 248582

Lines 1-8 Link Here

(-)x11-wm/libwraster/Makefile (-8 / +3 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= libwraster	3	PORTNAME= libwraster
4	PORTVERSION= 0.95.8	4	PORTVERSION= 0.95.9
5	PORTREVISION= 1
6	CATEGORIES= x11-wm windowmaker	5	CATEGORIES= x11-wm windowmaker
7	MASTER_SITES= http://windowmaker.org/pub/source/release/	6	MASTER_SITES= http://windowmaker.org/pub/source/release/
8	DISTNAME= WindowMaker-${PORTVERSION}	7	DISTNAME= WindowMaker-${PORTVERSION}
Lines 17-23 Link Here
17	libjbig.so:graphics/jbigkit \	16	libjbig.so:graphics/jbigkit \
18	libtiff.so:graphics/tiff \	17	libtiff.so:graphics/tiff \
19	libwebp.so:graphics/webp \	18	libwebp.so:graphics/webp \
20	libMagickWand-6.so:graphics/ImageMagick6	19	libMagickWand-7.so:graphics/ImageMagick7
21		20
22	USES= jpeg libtool localbase pathfix pkgconfig xorg	21	USES= jpeg libtool localbase pathfix pkgconfig xorg
23	USE_LDCONFIG= yes	22	USE_LDCONFIG= yes
Lines 25-31 Link Here
25	BUILD_WRKSRC= ${WRKSRC}/wrlib	24	BUILD_WRKSRC= ${WRKSRC}/wrlib
26	INSTALL_WRKSRC= ${WRKSRC}/wrlib	25	INSTALL_WRKSRC= ${WRKSRC}/wrlib
27	GNU_CONFIGURE= yes	26	GNU_CONFIGURE= yes
28	CONFIGURE_ARGS= --with-pixmapdir=${PREFIX}/include/X11/pixmaps \	27	CONFIGURE_ARGS= --with-pixmapdir=${PREFIX}/share/pixmaps \
29	--with-localedir=${PREFIX}/share/locale \	28	--with-localedir=${PREFIX}/share/locale \
30	--with-libs-from="-L${LOCALBASE}/lib" \	29	--with-libs-from="-L${LOCALBASE}/lib" \
31	--with-incs-from="-I${LOCALBASE}/include" \	30	--with-incs-from="-I${LOCALBASE}/include" \
Lines 40-47 Link Here
40	pre-build:	39	pre-build:
41	cd ${WRKSRC} && ${MAKE_CMD} config-paths.h	40	cd ${WRKSRC} && ${MAKE_CMD} config-paths.h
42		41
43	post-install:
44	cd ${WRKSRC}/doc && ${INSTALL_MAN} \
45	get-wraster-flags.1 ${STAGEDIR}${MANPREFIX}/man/man1
46
47	.include <bsd.port.mk>	42	.include <bsd.port.mk>

Lines 1-20 Link Here

(-)x11-wm/libwraster/files/patch-wrlib__wraster.h (-20 lines)
1	--- wrlib/wraster.h.orig 2015-08-11 18:41:14 UTC
2	+++ wrlib/wraster.h
3	@@ -61,10 +61,14 @@
4	* mechanism and define an internal macro appropriately. Please note that the macro are not considered being
5	* part of the public API.
6	*/
7	-#if __GNUC__ > 4 \|\| (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
8	+#ifndef __has_feature
9	+#define __has_feature(x) 0
10	+#endif
11	+#ifndef __has_extension
12	+#define __has_extension __has_feature
13	+#endif
14	+#if __has_extension(attribute_depreated_with_message)
15	#define __wrlib_deprecated(msg) __attribute__ ((deprecated(msg)))
16	-#elif __GNUC__ >= 3
17	-#define __wrlib_deprecated(msg) __attribute__ ((deprecated))
18	#else
19	#define __wrlib_deprecated(msg)
20	#endif

Line 0 Link Here

(-)x11-wm/libwraster/files/patch-wrlib_wraster.h (+20 lines)
	1	--- wrlib/wraster.h.orig 2015-08-11 18:41:14 UTC
	2	+++ wrlib/wraster.h
	3	@@ -61,10 +61,14 @@
	4	* mechanism and define an internal macro appropriately. Please note that the macro are not considered being
	5	* part of the public API.
	6	*/
	7	-#if __GNUC__ > 4 \|\| (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
	8	+#ifndef __has_feature
	9	+#define __has_feature(x) 0
	10	+#endif
	11	+#ifndef __has_extension
	12	+#define __has_extension __has_feature
	13	+#endif
	14	+#if __has_extension(attribute_depreated_with_message)
	15	#define __wrlib_deprecated(msg) __attribute__ ((deprecated(msg)))
	16	-#elif __GNUC__ >= 3
	17	-#define __wrlib_deprecated(msg) __attribute__ ((deprecated))
	18	#else
	19	#define __wrlib_deprecated(msg)
	20	#endif

Lines 2-9 Link Here

(-)x11-wm/windowmaker/Makefile (-4 / +3 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= windowmaker	4	PORTNAME= windowmaker
5	PORTVERSION= 0.95.8	5	PORTVERSION= 0.95.9
6	PORTREVISION= 2
7	CATEGORIES= x11-wm windowmaker	6	CATEGORIES= x11-wm windowmaker
8	MASTER_SITES= http://windowmaker.org/pub/source/release/	7	MASTER_SITES= http://windowmaker.org/pub/source/release/
9	DISTNAME= WindowMaker-${PORTVERSION}	8	DISTNAME= WindowMaker-${PORTVERSION}
Lines 18-24 Link Here
18	libjbig.so:graphics/jbigkit \	17	libjbig.so:graphics/jbigkit \
19	libtiff.so:graphics/tiff \	18	libtiff.so:graphics/tiff \
20	libwebp.so:graphics/webp \	19	libwebp.so:graphics/webp \
21	libMagickWand-6.so:graphics/ImageMagick6 \	20	libMagickWand-7.so:graphics/ImageMagick7 \
22	libwraster.so.6:x11-wm/libwraster \	21	libwraster.so.6:x11-wm/libwraster \
23	libfontconfig.so:x11-fonts/fontconfig \	22	libfontconfig.so:x11-fonts/fontconfig \
24	libfreetype.so:print/freetype2 \	23	libfreetype.so:print/freetype2 \
Lines 32-38 Link Here
32	GNU_CONFIGURE= yes	31	GNU_CONFIGURE= yes
33	CONFIGURE_ENV= ac_cv_header_sys_inotify_h=no \	32	CONFIGURE_ENV= ac_cv_header_sys_inotify_h=no \
34	wm_cv_func_secure_getenv=no	33	wm_cv_func_secure_getenv=no
35	CONFIGURE_ARGS= --with-pixmapdir=${PREFIX}/include/X11/pixmaps \	34	CONFIGURE_ARGS= --with-pixmapdir=${PREFIX}/share/pixmaps \
36	--localedir=${PREFIX}/share/locale \	35	--localedir=${PREFIX}/share/locale \
37	--with-libs-from="-L${LOCALBASE}/lib" \	36	--with-libs-from="-L${LOCALBASE}/lib" \
38	--with-incs-from="-I${LOCALBASE}/include" \	37	--with-incs-from="-I${LOCALBASE}/include" \

Line 0 Link Here

(-)x11-wm/windowmaker/files/patch-WINGs_Examples_Makefile.in (+19 lines)
	1	--- WINGs/Examples/Makefile.in.orig 2020-08-10 19:15:59 UTC
	2	+++ WINGs/Examples/Makefile.in
	3	@@ -359,14 +359,14 @@ top_srcdir = @top_srcdir@
	4	wprefs_bindir = @wprefs_bindir@
	5	wprefs_datadir = @wprefs_datadir@
	6	AUTOMAKE_OPTIONS =
	7	-LDADD = $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
	8	+LDADD = $(top_builddir)/WINGs/libWINGs.la -lwraster \
	9	$(top_builddir)/WINGs/libWUtil.la \
	10	@XFTLIBS@ @INTLIBS@ @XLIBS@
	11
	12	colorpick_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
	13	fontl_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
	14	puzzle_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
	15	-AM_CPPFLAGS = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
	16	+AM_CPPFLAGS = -I$(top_srcdir)/WINGs -I$(top_srcdir)/src \
	17	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@
	18
	19	all: all-am

Line 0 Link Here

(-)x11-wm/windowmaker/files/patch-WINGs_Extras_Makefile.in (+23 lines)
	1	--- WINGs/Extras/Makefile.in.orig 2020-08-10 19:15:59 UTC
	2	+++ WINGs/Extras/Makefile.in
	3	@@ -155,7 +155,6 @@ am__v_lt_1 =
	4	test_SOURCES = test.c
	5	test_OBJECTS = test.$(OBJEXT)
	6	am__DEPENDENCIES_1 = $(top_builddir)/WINGs/libWINGs.la \
	7	- $(top_builddir)/wrlib/libwraster.la \
	8	$(top_builddir)/WINGs/libWUtil.la
	9	test_DEPENDENCIES = wtableview.o wtabledelegates.o \
	10	$(am__DEPENDENCIES_1)
	11	@@ -404,10 +403,10 @@ libExtraWINGs_la_SOURCES = \
	12	wtableview.h \
	13	wtabledelegates.h
	14
	15	-AM_CPPFLAGS = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs \
	16	+AM_CPPFLAGS = -I$(top_srcdir)/WINGs \
	17	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@
	18
	19	-LDADD = $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
	20	+LDADD = $(top_builddir)/WINGs/libWINGs.la -lwraster \
	21	$(top_builddir)/WINGs/libWUtil.la \
	22	@XFTLIBS@ @INTLIBS@
	23

Line 0 Link Here

(-)x11-wm/windowmaker/files/patch-WINGs_Makefile.in (+33 lines)
	1	--- WINGs/Makefile.in.orig 2020-08-10 19:15:59 UTC
	2	+++ WINGs/Makefile.in
	3	@@ -141,8 +141,7 @@ am__uninstall_files_from_dir = { \
	4	}
	5	am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)"
	6	LTLIBRARIES = $(lib_LTLIBRARIES)
	7	-libWINGs_la_DEPENDENCIES = libWUtil.la \
	8	- $(top_builddir)/wrlib/libwraster.la
	9	+libWINGs_la_DEPENDENCIES = libWUtil.la
	10	am_libWINGs_la_OBJECTS = configuration.lo dragcommon.lo \
	11	dragdestination.lo dragsource.lo selection.lo wappresource.lo \
	12	wballoon.lo wbox.lo wbrowser.lo wbutton.lo wcolor.lo \
	13	@@ -478,8 +477,8 @@ DIST_SUBDIRS = $(SUBDIRS) Tests Examples Extras
	14	libWINGs_la_LDFLAGS = -version-info @WINGS_VERSION@
	15	libWUtil_la_LDFLAGS = -version-info @WUTIL_VERSION@
	16	lib_LTLIBRARIES = libWUtil.la libWINGs.la
	17	-LDADD = libWUtil.la libWINGs.la $(top_builddir)/wrlib/libwraster.la @INTLIBS@
	18	-libWINGs_la_LIBADD = libWUtil.la $(top_builddir)/wrlib/libwraster.la @XLIBS@ @XFTLIBS@ @FCLIBS@ @LIBM@ @PANGOLIBS@
	19	+LDADD = libWUtil.la libWINGs.la -lwraster @INTLIBS@
	20	+libWINGs_la_LIBADD = libWUtil.la -lwraster @XLIBS@ @XFTLIBS@ @FCLIBS@ @LIBM@ @PANGOLIBS@
	21	libWUtil_la_LIBADD = @LIBBSD@
	22	EXTRA_DIST = BUGS make-rgb Examples Extras Tests
	23
	24	@@ -553,7 +552,8 @@ libWUtil_la_SOURCES = \
	25
	26	AM_CFLAGS =
	27	AM_CPPFLAGS = -DRESOURCE_PATH=\"$(datadir)/WINGs\" \
	28	- -I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
	29	+ -DPREFIX=\"$(prefix)\" \
	30	+ -I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/src \
	31	@XFTFLAGS@ @HEADER_SEARCH_PATH@
	32
	33	pkgconfigdir = $(prefix)/libdata/pkgconfig

Line 0 Link Here

(-)x11-wm/windowmaker/files/patch-WINGs_Tests_Makefile.in (+41 lines)
	1	--- WINGs/Tests/Makefile.in.orig 2020-08-10 19:15:59 UTC
	2	+++ WINGs/Tests/Makefile.in
	3	@@ -118,7 +118,6 @@ am_testmywidget_OBJECTS = testmywidget.$(OBJEXT) mywid
	4	testmywidget_OBJECTS = $(am_testmywidget_OBJECTS)
	5	testmywidget_LDADD = $(LDADD)
	6	testmywidget_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la \
	7	- $(top_builddir)/wrlib/libwraster.la \
	8	$(top_builddir)/WINGs/libWUtil.la
	9	AM_V_lt = $(am__v_lt_@AM_V@)
	10	am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
	11	@@ -128,13 +127,11 @@ wmfile_SOURCES = wmfile.c
	12	wmfile_OBJECTS = wmfile.$(OBJEXT)
	13	wmfile_LDADD = $(LDADD)
	14	wmfile_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la \
	15	- $(top_builddir)/wrlib/libwraster.la \
	16	$(top_builddir)/WINGs/libWUtil.la
	17	wmquery_SOURCES = wmquery.c
	18	wmquery_OBJECTS = wmquery.$(OBJEXT)
	19	wmquery_LDADD = $(LDADD)
	20	wmquery_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la \
	21	- $(top_builddir)/wrlib/libwraster.la \
	22	$(top_builddir)/WINGs/libWUtil.la
	23	wtest_SOURCES = wtest.c
	24	wtest_OBJECTS = wtest.$(OBJEXT)
	25	@@ -373,14 +370,14 @@ top_srcdir = @top_srcdir@
	26	wprefs_bindir = @wprefs_bindir@
	27	wprefs_datadir = @wprefs_datadir@
	28	AUTOMAKE_OPTIONS =
	29	-LDADD = $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
	30	+LDADD = $(top_builddir)/WINGs/libWINGs.la -lwraster \
	31	$(top_builddir)/WINGs/libWUtil.la \
	32	@XFTLIBS@ @INTLIBS@ @XLIBS@
	33
	34	testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h
	35	wtest_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
	36	EXTRA_DIST = logo.xpm upbtn.xpm wm.html wm.png
	37	-AM_CPPFLAGS = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
	38	+AM_CPPFLAGS = -I$(top_srcdir)/WINGs -I$(top_srcdir)/src \
	39	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @XFTFLAGS@ @HEADER_SEARCH_PATH@
	40
	41	all: all-am

Line 0 Link Here

(-)x11-wm/windowmaker/files/patch-WINGs_WINGs_WINGsP.h (+16 lines)
	1	--- WINGs/WINGs/WINGsP.h.orig 2019-02-15 23:34:25 UTC
	2	+++ WINGs/WINGs/WINGsP.h
	3	@@ -17,7 +17,13 @@
	4
	5	#include <assert.h>
	6
	7	+#ifdef _XLOCALE_H_ /* workaround for libX11<1.4 */
	8	+#undef _XLOCALE_H_
	9	#include <stdlib.h>
	10	+#define _XLOCALE_H_
	11	+#else
	12	+#include <stdlib.h>
	13	+#endif
	14	#include <string.h>
	15	#include <strings.h>
	16	#include <stdio.h>

Lines 1-19 Link Here

(-)x11-wm/windowmaker/files/patch-WINGs__Examples__Makefile.in (-19 lines)
1	--- WINGs/Examples/Makefile.in.orig 2015-10-06 04:12:10 UTC
2	+++ WINGs/Examples/Makefile.in
3	@@ -342,14 +342,14 @@ top_srcdir = @top_srcdir@
4	wprefs_bindir = @wprefs_bindir@
5	wprefs_datadir = @wprefs_datadir@
6	AUTOMAKE_OPTIONS =
7	-LDADD = $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
8	+LDADD = $(top_builddir)/WINGs/libWINGs.la -lwraster \
9	$(top_builddir)/WINGs/libWUtil.la \
10	@XFTLIBS@ @INTLIBS@ @XLIBS@
11
12	colorpick_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
13	fontl_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
14	puzzle_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
15	-AM_CPPFLAGS = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
16	+AM_CPPFLAGS = -I$(top_srcdir)/WINGs -I$(top_srcdir)/src \
17	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@
18
19	all: all-am

Lines 1-23 Link Here

(-)x11-wm/windowmaker/files/patch-WINGs__Extras__Makefile.in (-23 lines)
1	--- WINGs/Extras/Makefile.in.orig 2015-10-06 04:12:10 UTC
2	+++ WINGs/Extras/Makefile.in
3	@@ -145,7 +145,6 @@ PROGRAMS = $(noinst_PROGRAMS)
4	test_SOURCES = test.c
5	test_OBJECTS = test.$(OBJEXT)
6	am__DEPENDENCIES_1 = $(top_builddir)/WINGs/libWINGs.la \
7	- $(top_builddir)/wrlib/libwraster.la \
8	$(top_builddir)/WINGs/libWUtil.la
9	test_DEPENDENCIES = wtableview.o wtabledelegates.o \
10	$(am__DEPENDENCIES_1)
11	@@ -386,10 +385,10 @@ libExtraWINGs_la_SOURCES = \
12	wtableview.h \
13	wtabledelegates.h
14
15	-AM_CPPFLAGS = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs \
16	+AM_CPPFLAGS = -I$(top_srcdir)/WINGs \
17	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@
18
19	-LDADD = $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
20	+LDADD = $(top_builddir)/WINGs/libWINGs.la -lwraster \
21	$(top_builddir)/WINGs/libWUtil.la \
22	@XFTLIBS@ @INTLIBS@
23

Lines 1-33 Link Here

(-)x11-wm/windowmaker/files/patch-WINGs__Makefile.in (-33 lines)
1	--- WINGs/Makefile.in.orig 2015-10-06 04:12:10 UTC
2	+++ WINGs/Makefile.in
3	@@ -135,8 +135,7 @@ am__uninstall_files_from_dir = { \
4	am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
5	"$(DESTDIR)$(pkgconfigdir)"
6	LTLIBRARIES = $(lib_LTLIBRARIES)
7	-libWINGs_la_DEPENDENCIES = libWUtil.la \
8	- $(top_builddir)/wrlib/libwraster.la
9	+libWINGs_la_DEPENDENCIES = libWUtil.la
10	am_libWINGs_la_OBJECTS = configuration.lo dragcommon.lo \
11	dragdestination.lo dragsource.lo selection.lo wappresource.lo \
12	wballoon.lo wbox.lo wbrowser.lo wbutton.lo wcolor.lo \
13	@@ -438,8 +437,8 @@ libWINGs_la_LDFLAGS = -version-info @WIN
14	libWUtil_la_LDFLAGS = -version-info @WUTIL_VERSION@
15	dist_bin_SCRIPTS = get-wings-flags get-wutil-flags
16	lib_LTLIBRARIES = libWUtil.la libWINGs.la
17	-LDADD = libWUtil.la libWINGs.la $(top_builddir)/wrlib/libwraster.la @INTLIBS@
18	-libWINGs_la_LIBADD = libWUtil.la $(top_builddir)/wrlib/libwraster.la @XLIBS@ @XFTLIBS@ @FCLIBS@ @LIBM@ @PANGOLIBS@
19	+LDADD = libWUtil.la libWINGs.la -lwraster @INTLIBS@
20	+libWINGs_la_LIBADD = libWUtil.la -lwraster @XLIBS@ @XFTLIBS@ @FCLIBS@ @LIBM@ @PANGOLIBS@
21	libWUtil_la_LIBADD = @LIBBSD@
22	EXTRA_DIST = BUGS make-rgb Examples Extras Tests
23
24	@@ -513,7 +512,8 @@ libWUtil_la_SOURCES = \
25
26	AM_CFLAGS =
27	AM_CPPFLAGS = -DRESOURCE_PATH=\"$(datadir)/WINGs\" \
28	- -I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
29	+ -DPREFIX=\"$(prefix)\" \
30	+ -I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/src \
31	@XFTFLAGS@ @HEADER_SEARCH_PATH@
32
33	pkgconfigdir = $(prefix)/libdata/pkgconfig

Lines 1-41 Link Here

(-)x11-wm/windowmaker/files/patch-WINGs__Tests__Makefile.in (-41 lines)
1	--- WINGs/Tests/Makefile.in.orig 2015-10-06 04:12:10 UTC
2	+++ WINGs/Tests/Makefile.in
3	@@ -109,7 +109,6 @@ am_testmywidget_OBJECTS = testmywidget.$
4	testmywidget_OBJECTS = $(am_testmywidget_OBJECTS)
5	testmywidget_LDADD = $(LDADD)
6	testmywidget_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la \
7	- $(top_builddir)/wrlib/libwraster.la \
8	$(top_builddir)/WINGs/libWUtil.la
9	AM_V_lt = $(am__v_lt_@AM_V@)
10	am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
11	@@ -119,13 +118,11 @@ wmfile_SOURCES = wmfile.c
12	wmfile_OBJECTS = wmfile.$(OBJEXT)
13	wmfile_LDADD = $(LDADD)
14	wmfile_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la \
15	- $(top_builddir)/wrlib/libwraster.la \
16	$(top_builddir)/WINGs/libWUtil.la
17	wmquery_SOURCES = wmquery.c
18	wmquery_OBJECTS = wmquery.$(OBJEXT)
19	wmquery_LDADD = $(LDADD)
20	wmquery_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la \
21	- $(top_builddir)/wrlib/libwraster.la \
22	$(top_builddir)/WINGs/libWUtil.la
23	wtest_SOURCES = wtest.c
24	wtest_OBJECTS = wtest.$(OBJEXT)
25	@@ -355,14 +352,14 @@ top_srcdir = @top_srcdir@
26	wprefs_bindir = @wprefs_bindir@
27	wprefs_datadir = @wprefs_datadir@
28	AUTOMAKE_OPTIONS =
29	-LDADD = $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
30	+LDADD = $(top_builddir)/WINGs/libWINGs.la -lwraster \
31	$(top_builddir)/WINGs/libWUtil.la \
32	@XFTLIBS@ @INTLIBS@ @XLIBS@
33
34	testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h
35	wtest_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
36	EXTRA_DIST = logo.xpm upbtn.xpm wm.html wm.png
37	-AM_CPPFLAGS = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
38	+AM_CPPFLAGS = -I$(top_srcdir)/WINGs -I$(top_srcdir)/src \
39	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @XFTFLAGS@ @HEADER_SEARCH_PATH@
40
41	all: all-am

Lines 1-16 Link Here

(-)x11-wm/windowmaker/files/patch-WINGs__WINGs__WINGsP.h (-16 lines)
1	--- WINGs/WINGs/WINGsP.h.orig 2015-08-11 18:41:14 UTC
2	+++ WINGs/WINGs/WINGsP.h
3	@@ -17,7 +17,13 @@
4
5	#include <assert.h>
6
7	+#ifdef _XLOCALE_H_ /* workaround for libX11<1.4 */
8	+#undef _XLOCALE_H_
9	+#include <stdlib.h>
10	+#define _XLOCALE_H_
11	+#else
12	#include <stdlib.h>
13	+#endif
14	#include <string.h>
15	#include <strings.h>
16	#include <stdio.h>

Line 0 Link Here

(-)x11-wm/windowmaker/files/patch-WPrefs.app_Makefile.in (+19 lines)
	1	--- WPrefs.app/Makefile.in.orig 2020-08-10 19:15:59 UTC
	2	+++ WPrefs.app/Makefile.in
	3	@@ -481,13 +481,14 @@ WPrefs_SOURCES = \
	4	# Themes.c
	5	AM_CFLAGS =
	6	AM_CPPFLAGS = -DRESOURCE_PATH=\"$(wpdatadir)\" -DWMAKER_RESOURCE_PATH=\"$(pkgdatadir)\" \
	7	- -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@
	8	+ -DPREFIX=\"$(prefix)\" \
	9	+ -I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@
	10
	11	WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
	12	WPrefs_LDADD = \
	13	$(top_builddir)/WINGs/libWINGs.la\
	14	$(top_builddir)/WINGs/libWUtil.la\
	15	- $(top_builddir)/wrlib/libwraster.la \
	16	+ -lwraster \
	17	@XLFLAGS@ @XLIBS@ \
	18	@LIBM@ \
	19	@FCLIBS@ \

Line 0 Link Here

(-)x11-wm/windowmaker/files/patch-WPrefs.app_Menu.c (+25 lines)
	1	--- WPrefs.app/Menu.c.orig 2020-04-05 13:41:15 UTC
	2	+++ WPrefs.app/Menu.c
	3	@@ -518,19 +518,19 @@ static void createPanel(_Panel * p)
	4	data = putNewItem(panel, pad, DirectoryInfo, _("Themes"));
	5	data->param.directory.command = "setstyle";
	6	data->param.directory.directory =
	7	- "/usr/share/WindowMaker/Themes /usr/local/share/WindowMaker/Themes $HOME/GNUstep/Library/WindowMaker/Themes";
	8	+ "/usr/share/WindowMaker/Themes " PREFIX "/share/WindowMaker/Themes $HOME/GNUstep/Library/WindowMaker/Themes";
	9	data->param.directory.stripExt = 1;
	10
	11	data = putNewItem(panel, pad, DirectoryInfo, _("Bg Images (scale)"));
	12	data->param.directory.command = "wmsetbg -u -s";
	13	data->param.directory.directory =
	14	- "/opt/kde2/share/wallpapers /usr/share/WindowMaker/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds";
	15	+ "/opt/kde2/share/wallpapers " PREFIX "/share/WindowMaker/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds";
	16	data->param.directory.stripExt = 1;
	17
	18	data = putNewItem(panel, pad, DirectoryInfo, _("Bg Images (tile)"));
	19	data->param.directory.command = "wmsetbg -u -t";
	20	data->param.directory.directory =
	21	- "/opt/kde2/share/wallpapers /usr/share/WindowMaker/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds";
	22	+ "/opt/kde2/share/wallpapers " PREFIX "/share/WindowMaker/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds";
	23	data->param.directory.stripExt = 1;
	24
	25	smenu = putNewSubmenu(pad, _("Assorted XTerms"));

Line 0 Link Here

(-)x11-wm/windowmaker/files/patch-WPrefs.app_Paths.c (+24 lines)
	1	--- WPrefs.app/Paths.c.orig 2019-02-15 23:34:25 UTC
	2	+++ WPrefs.app/Paths.c
	3	@@ -78,9 +78,9 @@ static void showData(_Panel * panel)
	4	wwarning(_("bad value in option IconPath. Using default path list"));
	5	addPathToList(panel->icoL, -1, "~/pixmaps");
	6	addPathToList(panel->icoL, -1, "~/GNUstep/Library/Icons");
	7	- addPathToList(panel->icoL, -1, "/usr/include/X11/pixmaps");
	8	- addPathToList(panel->icoL, -1, "/usr/local/share/WindowMaker/Icons");
	9	- addPathToList(panel->icoL, -1, "/usr/local/share/WindowMaker/Pixmaps");
	10	+ addPathToList(panel->icoL, -1, PREFIX "/share/pixmaps");
	11	+ addPathToList(panel->icoL, -1, PREFIX "/share/WindowMaker/Icons");
	12	+ addPathToList(panel->icoL, -1, PREFIX "/share/WindowMaker/Pixmaps");
	13	addPathToList(panel->icoL, -1, "/usr/share/WindowMaker/Icons");
	14	} else {
	15	for (i = 0; i < WMGetPropListItemCount(array); i++) {
	16	@@ -95,7 +95,7 @@ static void showData(_Panel * panel)
	17	wwarning(_("bad value in option PixmapPath. Using default path list"));
	18	addPathToList(panel->pixL, -1, "~/pixmaps");
	19	addPathToList(panel->pixL, -1, "~/GNUstep/Library/WindowMaker/Pixmaps");
	20	- addPathToList(panel->pixL, -1, "/usr/local/share/WindowMaker/Pixmaps");
	21	+ addPathToList(panel->pixL, -1, PREFIX "/share/WindowMaker/Pixmaps");
	22	} else {
	23	for (i = 0; i < WMGetPropListItemCount(array); i++) {
	24	val = WMGetFromPLArray(array, i);

Lines 1-19 Link Here

(-)x11-wm/windowmaker/files/patch-WPrefs.app__Makefile.in (-19 lines)
1	--- WPrefs.app/Makefile.in.orig 2015-10-06 04:12:10 UTC
2	+++ WPrefs.app/Makefile.in
3	@@ -455,13 +455,14 @@ WPrefs_SOURCES = \
4	# Themes.c
5	AM_CFLAGS =
6	AM_CPPFLAGS = -DRESOURCE_PATH=\"$(wpdatadir)\" -DWMAKER_RESOURCE_PATH=\"$(pkgdatadir)\" \
7	- -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@
8	+ -DPREFIX=\"$(prefix)\" \
9	+ -I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@
10
11	WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
12	WPrefs_LDADD = \
13	$(top_builddir)/WINGs/libWINGs.la\
14	$(top_builddir)/WINGs/libWUtil.la\
15	- $(top_builddir)/wrlib/libwraster.la \
16	+ -lwraster \
17	@XLFLAGS@ @XLIBS@ \
18	@LIBM@ \
19	@FCLIBS@ \

Lines 1-25 Link Here

(-)x11-wm/windowmaker/files/patch-WPrefs.app__Menu.c (-25 lines)
1	--- WPrefs.app/Menu.c.orig 2015-08-11 18:41:14 UTC
2	+++ WPrefs.app/Menu.c
3	@@ -517,19 +517,19 @@ static void createPanel(_Panel * p)
4	data = putNewItem(panel, pad, DirectoryInfo, _("Themes"));
5	data->param.directory.command = "setstyle";
6	data->param.directory.directory =
7	- "/usr/share/WindowMaker/Themes /usr/local/share/WindowMaker/Themes $HOME/GNUstep/Library/WindowMaker/Themes";
8	+ "/usr/share/WindowMaker/Themes " PREFIX "/share/WindowMaker/Themes $HOME/GNUstep/Library/WindowMaker/Themes";
9	data->param.directory.stripExt = 1;
10
11	data = putNewItem(panel, pad, DirectoryInfo, _("Bg Images (scale)"));
12	data->param.directory.command = "wmsetbg -u -s";
13	data->param.directory.directory =
14	- "/opt/kde2/share/wallpapers /usr/share/WindowMaker/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds";
15	+ "/opt/kde2/share/wallpapers " PREFIX "/share/WindowMaker/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds";
16	data->param.directory.stripExt = 1;
17
18	data = putNewItem(panel, pad, DirectoryInfo, _("Bg Images (tile)"));
19	data->param.directory.command = "wmsetbg -u -t";
20	data->param.directory.directory =
21	- "/opt/kde2/share/wallpapers /usr/share/WindowMaker/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds";
22	+ "/opt/kde2/share/wallpapers " PREFIX "/share/WindowMaker/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds";
23	data->param.directory.stripExt = 1;
24
25	smenu = putNewSubmenu(pad, _("Assorted XTerms"));

Lines 1-24 Link Here

(-)x11-wm/windowmaker/files/patch-WPrefs.app__Paths.c (-24 lines)
1	--- WPrefs.app/Paths.c.orig 2015-08-11 18:41:14 UTC
2	+++ WPrefs.app/Paths.c
3	@@ -78,9 +78,9 @@ static void showData(_Panel * panel)
4	wwarning(_("bad value in option IconPath. Using default path list"));
5	addPathToList(panel->icoL, -1, "~/pixmaps");
6	addPathToList(panel->icoL, -1, "~/GNUstep/Library/Icons");
7	- addPathToList(panel->icoL, -1, "/usr/include/X11/pixmaps");
8	- addPathToList(panel->icoL, -1, "/usr/local/share/WindowMaker/Icons");
9	- addPathToList(panel->icoL, -1, "/usr/local/share/WindowMaker/Pixmaps");
10	+ addPathToList(panel->icoL, -1, PREFIX "/share/pixmaps");
11	+ addPathToList(panel->icoL, -1, PREFIX "/share/WindowMaker/Icons");
12	+ addPathToList(panel->icoL, -1, PREFIX "/share/WindowMaker/Pixmaps");
13	addPathToList(panel->icoL, -1, "/usr/share/WindowMaker/Icons");
14	} else {
15	for (i = 0; i < WMGetPropListItemCount(array); i++) {
16	@@ -95,7 +95,7 @@ static void showData(_Panel * panel)
17	wwarning(_("bad value in option PixmapPath. Using default path list"));
18	addPathToList(panel->pixL, -1, "~/pixmaps");
19	addPathToList(panel->pixL, -1, "~/GNUstep/Library/WindowMaker/Pixmaps");
20	- addPathToList(panel->pixL, -1, "/usr/local/share/WindowMaker/Pixmaps");
21	+ addPathToList(panel->pixL, -1, PREFIX "/share/WindowMaker/Pixmaps");
22	} else {
23	for (i = 0; i < WMGetPropListItemCount(array); i++) {
24	val = WMGetFromPLArray(array, i);

Line 0 Link Here

(-)x11-wm/windowmaker/files/patch-src_Makefile.in (+27 lines)
	1	--- src/Makefile.in.orig 2020-08-10 19:15:59 UTC
	2	+++ src/Makefile.in
	3	@@ -173,8 +173,7 @@ am_wmaker_OBJECTS = actions.$(OBJEXT) appicon.$(OBJEXT
	4	@USE_NESTED_FUNC_FALSE@ xmodifier.hack_nf.$(OBJEXT)
	5	wmaker_OBJECTS = $(am_wmaker_OBJECTS) $(nodist_wmaker_OBJECTS)
	6	wmaker_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la \
	7	- $(top_builddir)/WINGs/libWUtil.la \
	8	- $(top_builddir)/wrlib/libwraster.la
	9	+ $(top_builddir)/WINGs/libWUtil.la
	10	AM_V_lt = $(am__v_lt_@AM_V@)
	11	am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
	12	am__v_lt_0 = --silent
	13	@@ -467,13 +466,12 @@ wmaker_SOURCES = GNUstep.h WindowMaker.h actions.c act
	14	@USE_NESTED_FUNC_FALSE@CLEANFILES = $(nodist_wmaker_SOURCES)
	15	AM_CFLAGS =
	16	AM_CPPFLAGS = $(DFLAGS) \
	17	- -I$(top_srcdir)/wrlib \
	18	-I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@
	19
	20	wmaker_LDADD = \
	21	$(top_builddir)/WINGs/libWINGs.la\
	22	$(top_builddir)/WINGs/libWUtil.la\
	23	- $(top_builddir)/wrlib/libwraster.la\
	24	+ -lwraster \
	25	@XLFLAGS@ \
	26	@LIBXRANDR@ \
	27	@LIBXINERAMA@ \

Lines 1-27 Link Here

(-)x11-wm/windowmaker/files/patch-src__Makefile.in (-27 lines)
1	--- src/Makefile.in.orig 2015-10-06 04:12:09 UTC
2	+++ src/Makefile.in
3	@@ -164,8 +164,7 @@ am_wmaker_OBJECTS = actions.$(OBJEXT) ap
4	@USE_NESTED_FUNC_FALSE@ xmodifier.hack_nf.$(OBJEXT)
5	wmaker_OBJECTS = $(am_wmaker_OBJECTS) $(nodist_wmaker_OBJECTS)
6	wmaker_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la \
7	- $(top_builddir)/WINGs/libWUtil.la \
8	- $(top_builddir)/wrlib/libwraster.la
9	+ $(top_builddir)/WINGs/libWUtil.la
10	AM_V_lt = $(am__v_lt_@AM_V@)
11	am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
12	am__v_lt_0 = --silent
13	@@ -424,13 +423,12 @@ wmaker_SOURCES = GNUstep.h WindowMaker.h
14	@USE_NESTED_FUNC_FALSE@CLEANFILES = $(nodist_wmaker_SOURCES)
15	AM_CFLAGS =
16	AM_CPPFLAGS = $(DFLAGS) \
17	- -I$(top_srcdir)/wrlib \
18	-I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@
19
20	wmaker_LDADD = \
21	$(top_builddir)/WINGs/libWINGs.la\
22	$(top_builddir)/WINGs/libWUtil.la\
23	- $(top_builddir)/wrlib/libwraster.la\
24	+ -lwraster \
25	@XLFLAGS@ \
26	@LIBXRANDR@ \
27	@LIBXINERAMA@ \

Line 0 Link Here

(-)x11-wm/windowmaker/files/patch-util_Makefile.in (+63 lines)
	1	--- util/Makefile.in.orig 2020-08-10 19:15:59 UTC
	2	+++ util/Makefile.in
	3	@@ -154,14 +154,13 @@ wdwrite_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.
	4	wmagnify_SOURCES = wmagnify.c
	5	wmagnify_OBJECTS = wmagnify.$(OBJEXT)
	6	wmagnify_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la \
	7	- $(top_builddir)/WINGs/libWUtil.la \
	8	- $(top_builddir)/wrlib/libwraster.la
	9	+ $(top_builddir)/WINGs/libWUtil.la
	10	am_wmgenmenu_OBJECTS = wmgenmenu.$(OBJEXT)
	11	wmgenmenu_OBJECTS = $(am_wmgenmenu_OBJECTS)
	12	wmgenmenu_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.la
	13	am_wmiv_OBJECTS = wmiv.$(OBJEXT)
	14	wmiv_OBJECTS = $(am_wmiv_OBJECTS)
	15	-wmiv_DEPENDENCIES = $(top_builddir)/wrlib/libwraster.la \
	16	+wmiv_DEPENDENCIES = \
	17	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
	18	$(am__DEPENDENCIES_1)
	19	am_wmmenugen_OBJECTS = wmmenugen.$(OBJEXT) wmmenugen_misc.$(OBJEXT) \
	20	@@ -172,8 +171,7 @@ wmmenugen_DEPENDENCIES = $(top_builddir)/WINGs/libWUti
	21	wmsetbg_SOURCES = wmsetbg.c
	22	wmsetbg_OBJECTS = wmsetbg.$(OBJEXT)
	23	wmsetbg_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la \
	24	- $(top_builddir)/WINGs/libWUtil.la \
	25	- $(top_builddir)/wrlib/libwraster.la
	26	+ $(top_builddir)/WINGs/libWUtil.la
	27	wxcopy_SOURCES = wxcopy.c
	28	wxcopy_OBJECTS = wxcopy.$(OBJEXT)
	29	wxcopy_DEPENDENCIES =
	30	@@ -502,7 +500,7 @@ AUTOMAKE_OPTIONS =
	31	bin_SCRIPTS = wmaker.inst wm-oldmenu2new wkdemenu.pl
	32	EXTRA_DIST = wmaker.inst.in bughint wm-oldmenu2new wkdemenu.pl
	33	AM_CPPFLAGS = \
	34	- $(DFLAGS) -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib \
	35	+ $(DFLAGS) -I$(top_srcdir)/WINGs \
	36	@HEADER_SEARCH_PATH@ \
	37	-DETCDIR=\"sysconfdir\" -DDATADIR=\"pkgdatadir\"
	38
	39	@@ -525,13 +523,13 @@ geticonset_LDADD = $(top_builddir)/WINGs/libWUtil.la $
	40	wmagnify_LDADD = \
	41	$(top_builddir)/WINGs/libWINGs.la \
	42	$(top_builddir)/WINGs/libWUtil.la \
	43	- $(top_builddir)/wrlib/libwraster.la \
	44	+ -lwraster \
	45	@XLFLAGS@ @XLIBS@ @INTLIBS@
	46
	47	wmsetbg_LDADD = \
	48	$(top_builddir)/WINGs/libWINGs.la \
	49	$(top_builddir)/WINGs/libWUtil.la \
	50	- $(top_builddir)/wrlib/libwraster.la \
	51	+ -lwraster \
	52	@XLFLAGS@ @LIBXINERAMA@ @XLIBS@ @INTLIBS@
	53
	54	wmgenmenu_LDADD = \
	55	@@ -548,7 +546,7 @@ wmmenugen_SOURCES = wmmenugen.c wmmenugen.h wmmenugen_
	56	wmmenugen_parse_xdg.c
	57
	58	wmiv_LDADD = \
	59	- $(top_builddir)/wrlib/libwraster.la \
	60	+ -lwraster \
	61	@XLFLAGS@ @XLIBS@ \
	62	@GFXLIBS@ $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(LIBEXIF)
	63

Lines 1-63 Link Here

(-)x11-wm/windowmaker/files/patch-util__Makefile.in (-63 lines)
1	--- util/Makefile.in.orig 2015-10-06 04:12:09 UTC
2	+++ util/Makefile.in
3	@@ -145,14 +145,13 @@ wdwrite_DEPENDENCIES = $(top_builddir)/W
4	wmagnify_SOURCES = wmagnify.c
5	wmagnify_OBJECTS = wmagnify.$(OBJEXT)
6	wmagnify_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la \
7	- $(top_builddir)/WINGs/libWUtil.la \
8	- $(top_builddir)/wrlib/libwraster.la
9	+ $(top_builddir)/WINGs/libWUtil.la
10	am_wmgenmenu_OBJECTS = wmgenmenu.$(OBJEXT)
11	wmgenmenu_OBJECTS = $(am_wmgenmenu_OBJECTS)
12	wmgenmenu_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.la
13	am_wmiv_OBJECTS = wmiv.$(OBJEXT)
14	wmiv_OBJECTS = $(am_wmiv_OBJECTS)
15	-wmiv_DEPENDENCIES = $(top_builddir)/wrlib/libwraster.la \
16	+wmiv_DEPENDENCIES = \
17	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
18	$(am__DEPENDENCIES_1)
19	am_wmmenugen_OBJECTS = wmmenugen.$(OBJEXT) wmmenugen_misc.$(OBJEXT) \
20	@@ -163,8 +162,7 @@ wmmenugen_DEPENDENCIES = $(top_builddir)
21	wmsetbg_SOURCES = wmsetbg.c
22	wmsetbg_OBJECTS = wmsetbg.$(OBJEXT)
23	wmsetbg_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la \
24	- $(top_builddir)/WINGs/libWUtil.la \
25	- $(top_builddir)/wrlib/libwraster.la
26	+ $(top_builddir)/WINGs/libWUtil.la
27	wxcopy_SOURCES = wxcopy.c
28	wxcopy_OBJECTS = wxcopy.$(OBJEXT)
29	wxcopy_DEPENDENCIES =
30	@@ -477,7 +475,7 @@ AUTOMAKE_OPTIONS =
31	bin_SCRIPTS = wmaker.inst wm-oldmenu2new wkdemenu.pl
32	EXTRA_DIST = wmaker.inst.in bughint wm-oldmenu2new wkdemenu.pl
33	AM_CPPFLAGS = \
34	- $(DFLAGS) -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib \
35	+ $(DFLAGS) -I$(top_srcdir)/WINGs \
36	@HEADER_SEARCH_PATH@ \
37	-DETCDIR=\"sysconfdir\" -DDATADIR=\"pkgdatadir\"
38
39	@@ -500,13 +498,13 @@ geticonset_LDADD = $(top_builddir)/WINGs
40	wmagnify_LDADD = \
41	$(top_builddir)/WINGs/libWINGs.la \
42	$(top_builddir)/WINGs/libWUtil.la \
43	- $(top_builddir)/wrlib/libwraster.la \
44	+ -lwraster \
45	@XLFLAGS@ @XLIBS@ @INTLIBS@
46
47	wmsetbg_LDADD = \
48	$(top_builddir)/WINGs/libWINGs.la \
49	$(top_builddir)/WINGs/libWUtil.la \
50	- $(top_builddir)/wrlib/libwraster.la \
51	+ -lwraster \
52	@XLFLAGS@ @LIBXINERAMA@ @XLIBS@ @INTLIBS@
53
54	wmgenmenu_LDADD = \
55	@@ -523,7 +521,7 @@ wmmenugen_SOURCES = wmmenugen.c wmmenuge
56	wmmenugen_parse_xdg.c
57
58	wmiv_LDADD = \
59	- $(top_builddir)/wrlib/libwraster.la \
60	+ -lwraster \
61	@XLFLAGS@ @XLIBS@ \
62	@GFXLIBS@ $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(LIBEXIF)
63

Lines 1-12 Link Here

(-)x11-wm/windowmaker/files/patch-util__wmiv.c (-12 lines)
1	--- util/wmiv.c.orig 2015-08-11 18:41:14 UTC
2	+++ util/wmiv.c
3	@@ -28,7 +28,9 @@
4	#include <X11/Xlib.h>
5	#include "wraster.h"
6	#include <stdlib.h>
7	+#define __BSD_VISIBLE 1
8	#include <stdio.h>
9	+#undef __BSD_VISIBLE
10	#include <string.h>
11	#include <dirent.h>
12	#include <limits.h>

Line 0 Link Here

(-)x11-wm/windowmaker/files/patch-util_wmiv.c (+12 lines)
	1	--- util/wmiv.c.orig 2020-04-05 13:41:16 UTC
	2	+++ util/wmiv.c
	3	@@ -28,7 +28,9 @@
	4	#include <X11/Xlib.h>
	5	#include "wraster.h"
	6	#include <stdlib.h>
	7	+#define __BSD_VISIBLE 1
	8	#include <stdio.h>
	9	+#undef __BSD_VISIBLE
	10	#include <string.h>
	11	#include <dirent.h>
	12	#include <limits.h>

Lines 74-81 Link Here

(-)x11-wm/windowmaker/pkg-plist (-5 / +5 lines)
74	GNUstep/Applications/WPrefs.app/tiff/workspacename.tiff	74	GNUstep/Applications/WPrefs.app/tiff/workspacename.tiff
75	GNUstep/Applications/WPrefs.app/tiff/xis.tiff	75	GNUstep/Applications/WPrefs.app/tiff/xis.tiff
76	bin/convertfonts	76	bin/convertfonts
77	bin/get-wings-flags
78	bin/get-wutil-flags
79	bin/geticonset	77	bin/geticonset
80	bin/getstyle	78	bin/getstyle
81	bin/seticons	79	bin/seticons
Lines 199-204 Link Here
199	share/WindowMaker/Pixmaps/tile.xpm	197	share/WindowMaker/Pixmaps/tile.xpm
200	share/WindowMaker/README	198	share/WindowMaker/README
201	share/WindowMaker/README.themes	199	share/WindowMaker/README.themes
		200	share/WindowMaker/Styles/Adwaita.style
202	share/WindowMaker/Styles/Autumn.style	201	share/WindowMaker/Styles/Autumn.style
203	share/WindowMaker/Styles/Black.style	202	share/WindowMaker/Styles/Black.style
204	share/WindowMaker/Styles/BlackTexture.style	203	share/WindowMaker/Styles/BlackTexture.style
Lines 240-245 Link Here
240	share/WindowMaker/Themes/Pastel.style	239	share/WindowMaker/Themes/Pastel.style
241	share/WindowMaker/Themes/SteelBlueSilk.style	240	share/WindowMaker/Themes/SteelBlueSilk.style
242	share/WindowMaker/appearance.menu	241	share/WindowMaker/appearance.menu
		242	share/WindowMaker/appearance.menu.fy
		243	share/WindowMaker/appearance.menu.nl
		244	share/WindowMaker/background.menu.fy
		245	share/WindowMaker/background.menu.nl
243	share/WindowMaker/autostart.sh	246	share/WindowMaker/autostart.sh
244	share/WindowMaker/background.menu	247	share/WindowMaker/background.menu
245	share/WindowMaker/exitscript.sh	248	share/WindowMaker/exitscript.sh
Lines 372-379 Link Here
372	%%NLS%%man/cs/man1/wxpaste.1.gz	375	%%NLS%%man/cs/man1/wxpaste.1.gz
373	man/man1/WPrefs.1.gz	376	man/man1/WPrefs.1.gz
374	man/man1/WindowMaker.1.gz	377	man/man1/WindowMaker.1.gz
375	man/man1/get-wings-flags.1.gz
376	man/man1/get-wutil-flags.1.gz
377	man/man1/geticonset.1.gz	378	man/man1/geticonset.1.gz
378	man/man1/getstyle.1.gz	379	man/man1/getstyle.1.gz
379	man/man1/seticons.1.gz	380	man/man1/seticons.1.gz
Lines 388-394 Link Here
388	man/man1/wmsetbg.1.gz	389	man/man1/wmsetbg.1.gz
389	man/man1/wxcopy.1.gz	390	man/man1/wxcopy.1.gz
390	man/man1/wxpaste.1.gz	391	man/man1/wxpaste.1.gz
391	man/man8/upgrade-windowmaker-defaults.8.gz
392	%%NLS%%man/ru/man1/geticonset.1.gz	392	%%NLS%%man/ru/man1/geticonset.1.gz
393	%%NLS%%man/ru/man1/getstyle.1.gz	393	%%NLS%%man/ru/man1/getstyle.1.gz
394	%%NLS%%man/ru/man1/seticons.1.gz	394	%%NLS%%man/ru/man1/seticons.1.gz