Import fix for compatibility layer with Gtk+ 2

This requires bumping every dependency unfortunately.
This commit is contained in:
khorben 2016-02-20 02:25:23 +00:00
parent fdced1ceb2
commit 2bd9dff7f3
4 changed files with 22 additions and 5 deletions

View file

@ -1,8 +1,9 @@
# $NetBSD: Makefile,v 1.20 2016/02/19 23:50:03 khorben Exp $
# $NetBSD: Makefile,v 1.21 2016/02/20 02:25:23 khorben Exp $
#
DISTNAME= libDesktop-0.2.1
PKGNAME= deforaos-libdesktop-0.2.1
PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://www.defora.org/os/download/download/4394/

View file

@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.13 2016/02/19 23:50:03 khorben Exp $
# $NetBSD: buildlink3.mk,v 1.14 2016/02/20 02:25:23 khorben Exp $
#
BUILDLINK_TREE+= deforaos-libdesktop
@ -6,8 +6,8 @@ BUILDLINK_TREE+= deforaos-libdesktop
.if !defined(DEFORAOS_LIBDESKTOP_BUILDLINK3_MK)
DEFORAOS_LIBDESKTOP_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.deforaos-libdesktop+= deforaos-libdesktop>=0.2.1
BUILDLINK_ABI_DEPENDS.deforaos-libdesktop?= deforaos-libdesktop>=0.2.1
BUILDLINK_API_DEPENDS.deforaos-libdesktop+= deforaos-libdesktop>=0.2.1nb1
BUILDLINK_ABI_DEPENDS.deforaos-libdesktop?= deforaos-libdesktop>=0.2.1nb1
BUILDLINK_PKGSRCDIR.deforaos-libdesktop?= ../../x11/deforaos-libdesktop
.include "../../devel/deforaos-libsystem/buildlink3.mk"

View file

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

View file

@ -0,0 +1,15 @@
$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);