diff options
| author | Robby Workman <rworkman@slackbuilds.org> | 2010-12-19 10:49:22 -0600 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2010-12-19 10:49:22 -0600 |
| commit | 9819b2672e1e9d83058c6de896ca94e6820f424f (patch) | |
| tree | 2a7f2d7ff8d5334b29a3cfdc98fc19de84fbe083 | |
| parent | 3ecb0c8c66d60f769c294694439d6f1fc9dc120d (diff) | |
| download | slackbuilds-9819b2672e1e9d83058c6de896ca94e6820f424f.tar.gz | |
network/ModemManager: Fix build with newer glib2
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
| -rw-r--r-- | network/ModemManager/ModemManager.SlackBuild | 5 | ||||
| -rw-r--r-- | network/ModemManager/fixup_new_glib_api.patch | 42 |
2 files changed, 46 insertions, 1 deletions
diff --git a/network/ModemManager/ModemManager.SlackBuild b/network/ModemManager/ModemManager.SlackBuild index e1b85a8c5c..d32821c034 100644 --- a/network/ModemManager/ModemManager.SlackBuild +++ b/network/ModemManager/ModemManager.SlackBuild @@ -24,7 +24,7 @@ PRGNAM=ModemManager VERSION=${VERSION:-0.4} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -69,6 +69,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Let this build on -current (but no effect on 13.1) +patch -p1 < $CWD/fixup_new_glib_api.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/network/ModemManager/fixup_new_glib_api.patch b/network/ModemManager/fixup_new_glib_api.patch new file mode 100644 index 0000000000..4a5833db3c --- /dev/null +++ b/network/ModemManager/fixup_new_glib_api.patch @@ -0,0 +1,42 @@ +commit be28089dc4c1b07d9def45a3c763f432ae8322c4 +Author: Vincent Untz <vuntz@gnome.org> +Date: Mon Aug 9 10:31:45 2010 -0500 + + build: fix build with glib >= 2.25.12 (bgo #626421) + + Work around an API break in glib. + +--- + +diff --git a/libqcdm/tests/test-qcdm.c b/libqcdm/tests/test-qcdm.c +index 8685080..4e6f0cf 100644 +--- a/libqcdm/tests/test-qcdm.c ++++ b/libqcdm/tests/test-qcdm.c +@@ -28,7 +28,11 @@ typedef struct { + gpointer com_data; + } TestData; + ++#if GLIB_CHECK_VERSION(2,25,12) ++typedef GTestFixtureFunc TCFunc; ++#else + typedef void (*TCFunc)(void); ++#endif + + #define TESTCASE(t, d) g_test_create_case (#t, 0, d, NULL, (TCFunc) t, NULL) + +diff --git a/src/tests/test-modem-helpers.c b/src/tests/test-modem-helpers.c +index 92a7af8..74d2d94 100644 +--- a/src/tests/test-modem-helpers.c ++++ b/src/tests/test-modem-helpers.c +@@ -791,7 +791,11 @@ test_data_free (TestData *data) + } + + ++#if GLIB_CHECK_VERSION(2,25,12) ++typedef GTestFixtureFunc TCFunc; ++#else + typedef void (*TCFunc)(void); ++#endif + + #define TESTCASE(t, d) g_test_create_case (#t, 0, d, NULL, (TCFunc) t, NULL) + |