Sat Feb 20 02:25:23 2016 UTC ()
Import fix for compatibility layer with Gtk+ 2

This requires bumping every dependency unfortunately.


(khorben)
diff -r1.20 -r1.21 pkgsrc/x11/deforaos-libdesktop/Makefile
diff -r1.13 -r1.14 pkgsrc/x11/deforaos-libdesktop/buildlink3.mk
diff -r1.8 -r1.9 pkgsrc/x11/deforaos-libdesktop/distinfo
diff -r0 -r1.1 pkgsrc/x11/deforaos-libdesktop/patches/patch-include_Desktop_compat.h
cvs diff -r1.20 -r1.21 pkgsrc/x11/deforaos-libdesktop/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/deforaos-libdesktop/Makefile 2016/02/19 23:50:03 1.20
+++ pkgsrc/x11/deforaos-libdesktop/Makefile 2016/02/20 02:25:23 1.21
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: Makefile,v 1.20 2016/02/19 23:50:03 khorben Exp $ 1# $NetBSD: Makefile,v 1.21 2016/02/20 02:25:23 khorben Exp $
2# 2#
3 3
4DISTNAME= libDesktop-0.2.1 4DISTNAME= libDesktop-0.2.1
5PKGNAME= deforaos-libdesktop-0.2.1 5PKGNAME= deforaos-libdesktop-0.2.1
 6PKGREVISION= 1
6CATEGORIES= x11 7CATEGORIES= x11
7MASTER_SITES= http://www.defora.org/os/download/download/4394/ 8MASTER_SITES= http://www.defora.org/os/download/download/4394/
8 9
9MAINTAINER= khorben@defora.org 10MAINTAINER= khorben@defora.org
10HOMEPAGE= http://www.defora.org/ 11HOMEPAGE= http://www.defora.org/
11COMMENT= DeforaOS desktop library 12COMMENT= DeforaOS desktop library
12 13
13LICENSE= 2-clause-bsd 14LICENSE= 2-clause-bsd
14 15
15USE_TOOLS+= pkg-config 16USE_TOOLS+= pkg-config
16 17
17MAKE_FLAGS+= DESTDIR=${DESTDIR} 18MAKE_FLAGS+= DESTDIR=${DESTDIR}
18MAKE_FLAGS+= PREFIX=${PREFIX} 19MAKE_FLAGS+= PREFIX=${PREFIX}
cvs diff -r1.13 -r1.14 pkgsrc/x11/deforaos-libdesktop/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/x11/deforaos-libdesktop/buildlink3.mk 2016/02/19 23:50:03 1.13
+++ pkgsrc/x11/deforaos-libdesktop/buildlink3.mk 2016/02/20 02:25:23 1.14
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: buildlink3.mk,v 1.13 2016/02/19 23:50:03 khorben Exp $ 1# $NetBSD: buildlink3.mk,v 1.14 2016/02/20 02:25:23 khorben Exp $
2# 2#
3 3
4BUILDLINK_TREE+= deforaos-libdesktop 4BUILDLINK_TREE+= deforaos-libdesktop
5 5
6.if !defined(DEFORAOS_LIBDESKTOP_BUILDLINK3_MK) 6.if !defined(DEFORAOS_LIBDESKTOP_BUILDLINK3_MK)
7DEFORAOS_LIBDESKTOP_BUILDLINK3_MK:= 7DEFORAOS_LIBDESKTOP_BUILDLINK3_MK:=
8 8
9BUILDLINK_API_DEPENDS.deforaos-libdesktop+= deforaos-libdesktop>=0.2.1 9BUILDLINK_API_DEPENDS.deforaos-libdesktop+= deforaos-libdesktop>=0.2.1nb1
10BUILDLINK_ABI_DEPENDS.deforaos-libdesktop?= deforaos-libdesktop>=0.2.1 10BUILDLINK_ABI_DEPENDS.deforaos-libdesktop?= deforaos-libdesktop>=0.2.1nb1
11BUILDLINK_PKGSRCDIR.deforaos-libdesktop?= ../../x11/deforaos-libdesktop 11BUILDLINK_PKGSRCDIR.deforaos-libdesktop?= ../../x11/deforaos-libdesktop
12 12
13.include "../../devel/deforaos-libsystem/buildlink3.mk" 13.include "../../devel/deforaos-libsystem/buildlink3.mk"
14.include "../../x11/gtk2/buildlink3.mk" 14.include "../../x11/gtk2/buildlink3.mk"
15.endif # DEFORAOS_LIBDESKTOP_BUILDLINK3_MK 15.endif # DEFORAOS_LIBDESKTOP_BUILDLINK3_MK
16 16
17BUILDLINK_TREE+= -deforaos-libdesktop 17BUILDLINK_TREE+= -deforaos-libdesktop
cvs diff -r1.8 -r1.9 pkgsrc/x11/deforaos-libdesktop/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/deforaos-libdesktop/distinfo 2016/02/19 23:50:03 1.8
+++ pkgsrc/x11/deforaos-libdesktop/distinfo 2016/02/20 02:25:23 1.9
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.8 2016/02/19 23:50:03 khorben Exp $ 1$NetBSD: distinfo,v 1.9 2016/02/20 02:25:23 khorben Exp $
2 2
3SHA1 (libDesktop-0.2.1.tar.gz) = 456f910e10a3f8ffe51daa1a64a0da9b8928f7a9 3SHA1 (libDesktop-0.2.1.tar.gz) = 456f910e10a3f8ffe51daa1a64a0da9b8928f7a9
4RMD160 (libDesktop-0.2.1.tar.gz) = c66f8e7e3c41c93297692efd0cf9ccb4cc6f2736 4RMD160 (libDesktop-0.2.1.tar.gz) = c66f8e7e3c41c93297692efd0cf9ccb4cc6f2736
5SHA512 (libDesktop-0.2.1.tar.gz) = 3e6aee475382fed736e237896eed18e4c552daba8cb144300f6a1d73c321a12516520c9417820da17f7bf614995d3b333a7f7fb3cb6fddb782962809ff2e31f6 5SHA512 (libDesktop-0.2.1.tar.gz) = 3e6aee475382fed736e237896eed18e4c552daba8cb144300f6a1d73c321a12516520c9417820da17f7bf614995d3b333a7f7fb3cb6fddb782962809ff2e31f6
6Size (libDesktop-0.2.1.tar.gz) = 22801 bytes 6Size (libDesktop-0.2.1.tar.gz) = 22801 bytes
 7SHA1 (patch-include_Desktop_compat.h) = 93d2deb594e40d598286a8e491a56569994d3454
File Added: pkgsrc/x11/deforaos-libdesktop/patches/Attic/patch-include_Desktop_compat.h
$NetBSD: patch-include_Desktop_compat.h,v 1.1 2016/02/20 02:25:23 khorben Exp $

Fix compatibility layer for Gtk+ 2

--- include/Desktop/compat.h.orig	2015-11-18 21:10:09.000000000 +0000
+++ include/Desktop/compat.h
@@ -103,7 +103,7 @@
 # endif
 
 /* Gtk+ 3.0 */
-# if GTK_CHECK_VERSION(3, 0, 0)
+# if !GTK_CHECK_VERSION(3, 0, 0)
 void gdk_window_clear(GdkWindow * window);
 
 GtkWidget * gtk_box_new(GtkOrientation orientation, gint spacing);