Hillwood Yang
de96ef61f1
Update to version 0.4.8 OBS-URL: https://build.opensuse.org/request/show/896471 OBS-URL: https://build.opensuse.org/package/show/X11:MATE:Factory/mate-applet-softupd?expand=0&rev=14
43 lines
1.7 KiB
Diff
43 lines
1.7 KiB
Diff
diff -Nur mate-applet-softupd-0.4.8/configure.ac new/configure.ac
|
|
--- mate-applet-softupd-0.4.8/configure.ac 2019-03-18 22:09:12.000000000 +0100
|
|
+++ new/configure.ac 2021-06-01 02:18:16.446809987 +0200
|
|
@@ -74,7 +74,6 @@
|
|
USE_GTK="0"
|
|
AC_ARG_ENABLE([gtk],[AS_HELP_STRING([--enable-gtk],[compile only for the specified GTK version, 2 or 3 (default: check both, use GTK-3, if not found, use GTK-2))])],[FORCE_GTK=$enableval])
|
|
|
|
-PKG_CHECK_MODULES([PKG_GTK2], [gtk+-2.0], [FOUND_GTK2="1"], [FOUND_GTK2="0"])
|
|
PKG_CHECK_MODULES([PKG_GTK3], [gtk+-3.0], [FOUND_GTK3="1"], [FOUND_GTK3="0"])
|
|
|
|
if test $FORCE_GTK = "3" ; then
|
|
@@ -83,12 +82,6 @@
|
|
else
|
|
AC_MSG_ERROR(["*** GTK3 forced, but not found."])
|
|
fi
|
|
-elif test $FORCE_GTK = "2" ; then
|
|
- if test $FOUND_GTK2 = "1" ; then
|
|
- AM_PATH_GTK_2_0([2.24.0], [USE_GTK="2"], [AC_MSG_ERROR(["*** GTK2 forced, but not found."])])
|
|
- else
|
|
- AC_MSG_ERROR(["*** GTK2 forced, but not found."])
|
|
- fi
|
|
else
|
|
# Try to match the GTK version used by mate-panel.
|
|
PANEL_GTK=`$PKG_CONFIG --print-requires "$LIBMATEPANELAPPLET" 2>/dev/null |
|
|
@@ -96,17 +89,12 @@
|
|
case "$PANEL_GTK" in
|
|
gtk+-3*)
|
|
AM_PATH_GTK_3_0([3.14.0], [USE_GTK="3"], [AC_MSG_ERROR(["*** GTK3 used by mate-panel, but no suitable version found."])]);;
|
|
- gtk+-2*)
|
|
- AM_PATH_GTK_2_0([2.24.0], [USE_GTK="2"], [AC_MSG_ERROR(["*** GTK2 used by mate-panel, but no suitable version found."])]);;
|
|
esac
|
|
|
|
# Only accept GTK3 if at least 3.14; else resort to GTK2
|
|
if test $FOUND_GTK3 = "1" -a $USE_GTK = "0"; then
|
|
AM_PATH_GTK_3_0([3.14.0], [USE_GTK="3"], [USE_GTK="0"])
|
|
fi
|
|
- if test $FOUND_GTK2 = "1" -a $USE_GTK = "0" ; then
|
|
- AM_PATH_GTK_2_0([2.24.0], [USE_GTK="2"], [USE_GTK="0"])
|
|
- fi
|
|
fi
|
|
|
|
if test $USE_GTK = "3" ; then
|