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

add back patch that was removed in error

Browse Source 
reminded by nigel@
This commit is contained in:
jasper 2011-10-17 15:08:08 +00:00
parent b6f845c9bf
commit a3e19fdf5d
2 changed files with 69 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/glade/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.41 2011/10/17 14:37:31 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.42 2011/10/17 15:08:08 jasper Exp $
COMMENT= user interface builder for the gtk+3 toolkit
GNOME_VERSION= 3.10.2
GNOME_PROJECT= glade
REVISION= 0
REVISION= 1
CATEGORIES= devel

67
devel/glade/patches/patch-configure Normal file
View File

@ -0,0 +1,67 @@
$OpenBSD: patch-configure,v 1.8 2011/10/17 15:08:08 jasper Exp $
From 4dd25f0b6110e3a6c02e22fb491a1016f80106c9 Mon Sep 17 00:00:00 2001
From: Ignacio Casal Quinteiro <icq@gnome.org>
Date: Mon, 19 Sep 2011 19:57:05 +0000
Subject: Bump pygobject requisite to pygobject 3. Fixes bug #658667.
--- configure.orig Mon Oct 17 17:06:36 2011
+++ configure Mon Oct 17 17:06:40 2011
@@ -15208,10 +15208,10 @@ else
fi
-PYGOBJECT_REQS=2.27.0
+PYGOBJECT_REQS=2.90.4
PYGOBJECT_REQUIRED_MAJOR=2
-PYGOBJECT_REQUIRED_MINOR=27
-PYGOBJECT_REQUIRED_MICRO=0
+PYGOBJECT_REQUIRED_MINOR=90
+PYGOBJECT_REQUIRED_MICRO=4
# Check whether --enable-python was given.
if test "${enable_python+set}" = set; then :
@@ -15233,12 +15233,12 @@ if test -n "$PYGOBJECT_CFLAGS"; then
pkg_cv_PYGOBJECT_CFLAGS="$PYGOBJECT_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pygobject-2.0 >= \${PYGOBJECT_REQUIRED_MAJOR}.\${PYGOBJECT_REQUIRED_MINOR}.\${PYGOBJECT_REQUIRED_MICRO}\""; } >&5
- ($PKG_CONFIG --exists --print-errors "pygobject-2.0 >= ${PYGOBJECT_REQUIRED_MAJOR}.${PYGOBJECT_REQUIRED_MINOR}.${PYGOBJECT_REQUIRED_MICRO}") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pygobject-3.0 >= \${PYGOBJECT_REQUIRED_MAJOR}.\${PYGOBJECT_REQUIRED_MINOR}.\${PYGOBJECT_REQUIRED_MICRO}\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "pygobject-3.0 >= ${PYGOBJECT_REQUIRED_MAJOR}.${PYGOBJECT_REQUIRED_MINOR}.${PYGOBJECT_REQUIRED_MICRO}") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_PYGOBJECT_CFLAGS=`$PKG_CONFIG --cflags "pygobject-2.0 >= ${PYGOBJECT_REQUIRED_MAJOR}.${PYGOBJECT_REQUIRED_MINOR}.${PYGOBJECT_REQUIRED_MICRO}" 2>/dev/null`
+ pkg_cv_PYGOBJECT_CFLAGS=`$PKG_CONFIG --cflags "pygobject-3.0 >= ${PYGOBJECT_REQUIRED_MAJOR}.${PYGOBJECT_REQUIRED_MINOR}.${PYGOBJECT_REQUIRED_MICRO}" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -15250,12 +15250,12 @@ if test -n "$PYGOBJECT_LIBS"; then
pkg_cv_PYGOBJECT_LIBS="$PYGOBJECT_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pygobject-2.0 >= \${PYGOBJECT_REQUIRED_MAJOR}.\${PYGOBJECT_REQUIRED_MINOR}.\${PYGOBJECT_REQUIRED_MICRO}\""; } >&5
- ($PKG_CONFIG --exists --print-errors "pygobject-2.0 >= ${PYGOBJECT_REQUIRED_MAJOR}.${PYGOBJECT_REQUIRED_MINOR}.${PYGOBJECT_REQUIRED_MICRO}") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pygobject-3.0 >= \${PYGOBJECT_REQUIRED_MAJOR}.\${PYGOBJECT_REQUIRED_MINOR}.\${PYGOBJECT_REQUIRED_MICRO}\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "pygobject-3.0 >= ${PYGOBJECT_REQUIRED_MAJOR}.${PYGOBJECT_REQUIRED_MINOR}.${PYGOBJECT_REQUIRED_MICRO}") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_PYGOBJECT_LIBS=`$PKG_CONFIG --libs "pygobject-2.0 >= ${PYGOBJECT_REQUIRED_MAJOR}.${PYGOBJECT_REQUIRED_MINOR}.${PYGOBJECT_REQUIRED_MICRO}" 2>/dev/null`
+ pkg_cv_PYGOBJECT_LIBS=`$PKG_CONFIG --libs "pygobject-3.0 >= ${PYGOBJECT_REQUIRED_MAJOR}.${PYGOBJECT_REQUIRED_MINOR}.${PYGOBJECT_REQUIRED_MICRO}" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -15276,9 +15276,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- PYGOBJECT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "pygobject-2.0 >= ${PYGOBJECT_REQUIRED_MAJOR}.${PYGOBJECT_REQUIRED_MINOR}.${PYGOBJECT_REQUIRED_MICRO}" 2>&1`
+ PYGOBJECT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "pygobject-3.0 >= ${PYGOBJECT_REQUIRED_MAJOR}.${PYGOBJECT_REQUIRED_MINOR}.${PYGOBJECT_REQUIRED_MICRO}" 2>&1`
else
- PYGOBJECT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "pygobject-2.0 >= ${PYGOBJECT_REQUIRED_MAJOR}.${PYGOBJECT_REQUIRED_MINOR}.${PYGOBJECT_REQUIRED_MICRO}" 2>&1`
+ PYGOBJECT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "pygobject-3.0 >= ${PYGOBJECT_REQUIRED_MAJOR}.${PYGOBJECT_REQUIRED_MINOR}.${PYGOBJECT_REQUIRED_MICRO}" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$PYGOBJECT_PKG_ERRORS" >&5