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

Properly disable the wacom panel.

Browse Source
This commit is contained in:
ajacoutot 2012-05-24 07:58:20 +00:00
parent 56f2bead40
commit 4f0dd74211
5 changed files with 87 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
x11/gnome/controlcenter/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.64 2012/05/15 14:31:18 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.65 2012/05/24 07:58:20 ajacoutot Exp $
# XXX Binary files patch-panels_info_hostnames-test_txt and
# patch-panels_info_hostnames-test_txt.new differ
@ -10,6 +10,7 @@ COMMENT= GNOME control center
GNOME_PROJECT= gnome-control-center
GNOME_VERSION= 3.4.2
REVISION= 0
CATEGORIES= x11
@ -107,7 +108,18 @@ MODGNOME_LDFLAGS= -L${X11BASE}/lib -Wl,-rpath,${LOCALBASE}/lib/pulseaudio
FAKE_FLAGS= sysconfdir=${PREFIX}/share/examples/gnome-control-center
AUTOCONF_VERSION= 2.68
AUTOMAKE_VERSION= 1.11
BUILD_DEPENDS +=devel/autoconf/${AUTOCONF_VERSION} \
devel/automake/${AUTOMAKE_VERSION} \
devel/libtool \
x11/gnome/common
pre-configure:
@cd ${WRKSRC} && \
AUTOCONF_VERSION=${AUTOCONF_VERSION} \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
autoreconf -i
${SUBST_CMD} ${WRKSRC}/panels/printers/cc-printers-panel.c
.include <bsd.port.mk>

132
x11/gnome/controlcenter/patches/patch-configure
View File

@ -1,132 +0,0 @@
$OpenBSD: patch-configure,v 1.17 2012/05/15 14:31:18 ajacoutot Exp $
No libwacom on OpenBSD (depends on gudev; gnome-bluetooth is needed for
the wacom panel).
--- configure.orig Tue May 15 12:20:15 2012
+++ configure Tue May 15 16:22:04 2012
@@ -15671,124 +15671,6 @@ $as_echo "yes" >&6; }
fi
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WACOM_PANEL" >&5
-$as_echo_n "checking for WACOM_PANEL... " >&6; }
-
-if test -n "$WACOM_PANEL_CFLAGS"; then
- pkg_cv_WACOM_PANEL_CFLAGS="$WACOM_PANEL_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES
- gnome-settings-daemon >= \$GSD_REQUIRED_VERSION
- xi >= 1.2 x11 libwacom >= \$LIBWACOM_REQUIRED_VERSION
- gnome-desktop-3.0 >= \$GNOME_DESKTOP_REQUIRED_VERSION\""; } >&5
- ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES
- gnome-settings-daemon >= $GSD_REQUIRED_VERSION
- xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_WACOM_PANEL_CFLAGS=`$PKG_CONFIG --cflags "$COMMON_MODULES
- gnome-settings-daemon >= $GSD_REQUIRED_VERSION
- xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-if test -n "$WACOM_PANEL_LIBS"; then
- pkg_cv_WACOM_PANEL_LIBS="$WACOM_PANEL_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES
- gnome-settings-daemon >= \$GSD_REQUIRED_VERSION
- xi >= 1.2 x11 libwacom >= \$LIBWACOM_REQUIRED_VERSION
- gnome-desktop-3.0 >= \$GNOME_DESKTOP_REQUIRED_VERSION\""; } >&5
- ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES
- gnome-settings-daemon >= $GSD_REQUIRED_VERSION
- xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_WACOM_PANEL_LIBS=`$PKG_CONFIG --libs "$COMMON_MODULES
- gnome-settings-daemon >= $GSD_REQUIRED_VERSION
- xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
- WACOM_PANEL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$COMMON_MODULES
- gnome-settings-daemon >= $GSD_REQUIRED_VERSION
- xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION" 2>&1`
- else
- WACOM_PANEL_PKG_ERRORS=`$PKG_CONFIG --print-errors "$COMMON_MODULES
- gnome-settings-daemon >= $GSD_REQUIRED_VERSION
- xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$WACOM_PANEL_PKG_ERRORS" >&5
-
- as_fn_error $? "Package requirements ($COMMON_MODULES
- gnome-settings-daemon >= $GSD_REQUIRED_VERSION
- xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION) were not met:
-
-$WACOM_PANEL_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables WACOM_PANEL_CFLAGS
-and WACOM_PANEL_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
-
-elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables WACOM_PANEL_CFLAGS
-and WACOM_PANEL_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-
-else
- WACOM_PANEL_CFLAGS=$pkg_cv_WACOM_PANEL_CFLAGS
- WACOM_PANEL_LIBS=$pkg_cv_WACOM_PANEL_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-
GDESKTOP_PREFIX=`$PKG_CONFIG --variable prefix gsettings-desktop-schemas`

54
x11/gnome/controlcenter/patches/patch-configure_ac Normal file
View File

@ -0,0 +1,54 @@
$OpenBSD: patch-configure_ac,v 1.1 2012/05/24 07:58:20 ajacoutot Exp $
https://bugzilla.gnome.org/show_bug.cgi?id=676714
--- configure.ac.orig Thu May 24 09:00:30 2012
+++ configure.ac Thu May 24 09:11:26 2012
@@ -127,10 +127,6 @@ PKG_CHECK_MODULES(USER_ACCOUNTS_PANEL, $COMMON_MODULES
gnome-desktop-3.0
gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION
$SYSTEMD)
-PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES
- gnome-settings-daemon >= $GSD_REQUIRED_VERSION
- xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
GDESKTOP_PREFIX=`$PKG_CONFIG --variable prefix gsettings-desktop-schemas`
AC_SUBST(GDESKTOP_PREFIX)
@@ -200,6 +196,25 @@ else
fi
AM_CONDITIONAL(BUILD_CHEESE, test x${have_cheese} = xyes)
+# wacom is disabled for s390/s390x and non Linux platforms (needs udev)
+case $host_os in
+ linux*)
+ if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
+ have_wacom=no
+ else
+ PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES
+ gnome-settings-daemon >= $GSD_REQUIRED_VERSION
+ xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
+ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
+ have_wacom=yes
+ fi
+ ;;
+ *)
+ have_wacom=no
+ ;;
+esac
+AM_CONDITIONAL(BUILD_WACOM, [test x"$have_wacom" = x"yes"])
+
# This is a hard-dependency for the region and user-accounts panels
PKG_CHECK_MODULES(ISOCODES, iso-codes)
@@ -447,5 +462,10 @@ if test "x$with_systemd" = "xyes"; then
AC_MSG_NOTICE([** systemd (Systemd session tracking)])
else
AC_MSG_NOTICE([ Using ConsoleKit for session tracking])
+fi
+if test "x$have_wacom" = "xyes"; then
+ AC_MSG_NOTICE([** wacom (Wacom tablet panel)])
+else
+ AC_MSG_NOTICE([ Wacom panel disabled])
fi
AC_MSG_NOTICE([End options])

20
x11/gnome/controlcenter/patches/patch-panels_Makefile_am Normal file
View File

@ -0,0 +1,20 @@
$OpenBSD: patch-panels_Makefile_am,v 1.1 2012/05/24 07:58:20 ajacoutot Exp $
https://bugzilla.gnome.org/show_bug.cgi?id=676714
--- panels/Makefile.am.orig Mon Mar 5 15:04:55 2012
+++ panels/Makefile.am Thu May 24 09:23:10 2012
@@ -13,8 +13,11 @@ SUBDIRS= \
keyboard \
universal-access \
user-accounts \
- datetime \
- wacom
+ datetime
+
+if BUILD_WACOM
+SUBDIRS += wacom
+endif
if BUILD_PRINTERS
SUBDIRS += printers

25
x11/gnome/controlcenter/patches/patch-panels_Makefile_in
View File

@ -1,25 +0,0 @@
$OpenBSD: patch-panels_Makefile_in,v 1.6 2012/05/15 14:31:18 ajacoutot Exp $
No libwacom on OpenBSD (depends on gudev; gnome-bluetooth is needed for
the wacom panel).
--- panels/Makefile.in.orig Tue May 15 12:20:15 2012
+++ panels/Makefile.in Tue May 15 16:22:04 2012
@@ -73,7 +73,7 @@ ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = common background screen power color display mouse \
online-accounts region info sound keyboard universal-access \
- user-accounts datetime wacom printers network bluetooth
+ user-accounts datetime printers network bluetooth
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
am__relativize = \
dir0=`pwd`; \
@@ -311,7 +311,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = common background screen power color display mouse \
online-accounts region info sound keyboard universal-access \
- user-accounts datetime wacom $(am__append_1) $(am__append_2) \
+ user-accounts datetime $(am__append_1) $(am__append_2) \
$(am__append_3)
all: all-recursive