cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix after recent pangox-compat update.

Browse Source
This commit is contained in:
ajacoutot 2012-10-18 06:22:03 +00:00
parent 738f8654fa
commit f8b65620e7
5 changed files with 8 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
x11/gtkglext/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.16 2012/09/21 13:20:57 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.17 2012/10/18 06:22:03 ajacoutot Exp $
COMMENT= OpenGL extension to GTK+ 2.0 and later
DISTNAME= gtkglext-1.2.0
REVISION= 8
REVISION= 9
SHARED_LIBS= gdkglext-x11-1.0 0.0 \
gtkglext-x11-1.0 0.0
CATEGORIES= x11 graphics devel
@ -32,7 +32,7 @@ WANTLIB += xcb-render xcb-shm z
MODULES= devel/gettext
LIB_DEPENDS= x11/gtk+2 \
devel/pangox-compat
devel/pangox-compat>=0.0.2
USE_GMAKE= Yes
USE_LIBTOOL= Yes

91
x11/gtkglext/patches/patch-configure
View File

@ -1,91 +0,0 @@
$OpenBSD: patch-configure,v 1.1 2012/09/21 13:20:57 ajacoutot Exp $
--- configure.orig Fri Sep 21 08:34:54 2012
+++ configure Fri Sep 21 08:36:09 2012
@@ -19880,14 +19880,14 @@ if test -n "$PKG_CONFIG"; then
gtk+-2.0 >= 2.0.0 \\
gdk-2.0 >= 2.0.0 \\
pango >= 1.0.0 \\
-pangox >= 1.0.0 \\
+pangox >= 0.0.1 \\
gmodule-2.0 >= 2.0.0 \\
\"") >&5
($PKG_CONFIG --exists --print-errors "\
gtk+-2.0 >= 2.0.0 \
gdk-2.0 >= 2.0.0 \
pango >= 1.0.0 \
-pangox >= 1.0.0 \
+pangox >= 0.0.1 \
gmodule-2.0 >= 2.0.0 \
") 2>&5
ac_status=$?
@@ -19897,7 +19897,7 @@ gmodule-2.0 >= 2.0.0 \
gtk+-2.0 >= 2.0.0 \
gdk-2.0 >= 2.0.0 \
pango >= 1.0.0 \
-pangox >= 1.0.0 \
+pangox >= 0.0.1 \
gmodule-2.0 >= 2.0.0 \
" 2>/dev/null`
else
@@ -19916,14 +19916,14 @@ if test -n "$PKG_CONFIG"; then
gtk+-2.0 >= 2.0.0 \\
gdk-2.0 >= 2.0.0 \\
pango >= 1.0.0 \\
-pangox >= 1.0.0 \\
+pangox >= 0.0.1 \\
gmodule-2.0 >= 2.0.0 \\
\"") >&5
($PKG_CONFIG --exists --print-errors "\
gtk+-2.0 >= 2.0.0 \
gdk-2.0 >= 2.0.0 \
pango >= 1.0.0 \
-pangox >= 1.0.0 \
+pangox >= 0.0.1 \
gmodule-2.0 >= 2.0.0 \
") 2>&5
ac_status=$?
@@ -19933,7 +19933,7 @@ gmodule-2.0 >= 2.0.0 \
gtk+-2.0 >= 2.0.0 \
gdk-2.0 >= 2.0.0 \
pango >= 1.0.0 \
-pangox >= 1.0.0 \
+pangox >= 0.0.1 \
gmodule-2.0 >= 2.0.0 \
" 2>/dev/null`
else
@@ -19958,7 +19958,7 @@ fi
gtk+-2.0 >= 2.0.0 \
gdk-2.0 >= 2.0.0 \
pango >= 1.0.0 \
-pangox >= 1.0.0 \
+pangox >= 0.0.1 \
gmodule-2.0 >= 2.0.0 \
"`
else
@@ -19966,7 +19966,7 @@ gmodule-2.0 >= 2.0.0 \
gtk+-2.0 >= 2.0.0 \
gdk-2.0 >= 2.0.0 \
pango >= 1.0.0 \
-pangox >= 1.0.0 \
+pangox >= 0.0.1 \
gmodule-2.0 >= 2.0.0 \
"`
fi
@@ -19977,7 +19977,7 @@ gmodule-2.0 >= 2.0.0 \
gtk+-2.0 >= 2.0.0 \
gdk-2.0 >= 2.0.0 \
pango >= 1.0.0 \
-pangox >= 1.0.0 \
+pangox >= 0.0.1 \
gmodule-2.0 >= 2.0.0 \
) were not met:
@@ -19994,7 +19994,7 @@ echo "$as_me: error: Package requirements (\
gtk+-2.0 >= 2.0.0 \
gdk-2.0 >= 2.0.0 \
pango >= 1.0.0 \
-pangox >= 1.0.0 \
+pangox >= 0.0.1 \
gmodule-2.0 >= 2.0.0 \
) were not met:

9
x11/sawfish/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.65 2012/09/21 13:21:45 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.66 2012/10/18 06:22:03 ajacoutot Exp $
COMMENT= extensible window manager
@ -6,7 +6,7 @@ SHARED_ONLY= Yes
VERSION= 1.9.1
DISTNAME= sawfish-${VERSION}
REVISION= 0
REVISION= 1
CATEGORIES= x11
@ -28,7 +28,8 @@ RUN_DEPENDS= devel/desktop-file-utils \
x11/rep-gtk>=0.90.8.1 \
x11/gtk+2,-guic
LIB_DEPENDS= lang/librep \
LIB_DEPENDS= devel/pangox-compat>=0.0.2 \
lang/librep \
x11/gtk+2
WANTLIB += GL ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes
@ -38,7 +39,7 @@ WANTLIB += gdk_pixbuf_xlib-2.0 gio-2.0 glib-2.0 gmodule-2.0 gmp
WANTLIB += gobject-2.0 gthread-2.0 gtk-x11-2.0 harfbuzz icudata
WANTLIB += icule icuuc m pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pangoxft-1.0 pcre pixman-1 png pthread pthread-stubs
WANTLIB += rep xcb xcb-render xcb-shm z
WANTLIB += rep xcb xcb-render xcb-shm z pangox-1.0
MODULES= devel/gettext

17
x11/sawfish/patches/patch-configure_in
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-configure_in,v 1.1 2012/09/21 13:21:45 ajacoutot Exp $
Adapt after pangox removal from devel/pango.
--- configure.in.orig Sat Sep 1 10:46:55 2012
+++ configure.in Fri Sep 21 14:23:30 2012
@@ -202,10 +202,6 @@ PKG_CHECK_MODULES(PANGO, pango >= ${PANGO_MIN_VER}
,AC_DEFINE(HAVE_PANGO, 1, [Have pango]) FONT_LOADER="Pango"
,AC_MSG_ERROR([cannot locate pango >= $PANGO_MIN_VER]))
-PKG_CHECK_MODULES(PANGOX, pangox >= ${PANGO_MIN_VER}
- ,AC_DEFINE(HAVE_PANGO_X, 1, [Have pangox]) PANGO_MODULES="${PANGO_MODULES} pangox" FONT_LOADER="Pango X"
- ,AC_MSG_WARN([pango x support not available >= $PANGO_MIN_VER]))
-
PKG_CHECK_MODULES(PANGOXFT, pangoxft >= ${PANGO_MIN_VER}
,AC_DEFINE(HAVE_PANGO_XFT, 1, [Have pangoxft]) PANGO_MODULES="${PANGO_MODULES} pangoxft" have_pango_xft="yes" FONT_LOADER="Pango XFT" AC_SUBST(have_pango_xft)
,AC_MSG_WARN([pango xft support not available $PANGO_MIN_VER]))

35
x11/sawfish/patches/patch-src_fonts_c
View File

@ -1,35 +0,0 @@
$OpenBSD: patch-src_fonts_c,v 1.1 2012/09/21 13:21:45 ajacoutot Exp $
Adapt after pangox removal from devel/pango.
--- src/fonts.c.orig Sat Sep 1 10:47:01 2012
+++ src/fonts.c Fri Sep 21 14:23:30 2012
@@ -53,9 +53,6 @@
# define PANGO_ENABLE_BACKEND
# include <pango/pango.h>
# undef PANGO_ENABLE_BACKEND
-# ifdef HAVE_PANGO_X
-# include <pango/pangox.h>
-# endif
# ifdef HAVE_PANGO_XFT
# define PANGO_ENABLE_ENGINE
# include <pango/pangoxft.h>
@@ -429,8 +426,6 @@ pango_load (Lisp_Font *f)
#ifdef HAVE_PANGO_XFT
pango_context = pango_xft_get_context (dpy, screen_num);
-#else
- pango_context = pango_x_get_context (dpy, screen_num);
#endif
langname = g_strdup (setlocale (LC_CTYPE, NULL));
@@ -514,9 +509,7 @@ pango_draw_line (XftDraw *draw, Window id, GC gc, XftC
#ifdef HAVE_PANGO_XFT
if (PANGO_XFT_IS_FONT (font))
pango_xft_render (draw, xft_color, font, glyphs, x, y);
- else
#endif
- pango_x_render (dpy, id, gc, font, glyphs, x, y);
x += rect.width / PANGO_SCALE;
}