Skip to content

Instantly share code, notes, and snippets.

@reback00
Created May 28, 2021 10:46
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save reback00/b3b0cf8d367d114900b0e2b00f1af37b to your computer and use it in GitHub Desktop.
Save reback00/b3b0cf8d367d114900b0e2b00f1af37b to your computer and use it in GitHub Desktop.
Patch for Void's "gpredict" package to adapt to goocanvas 3
diff -Naurp1 a/configure b/configure
--- a/configure 2018-01-21 17:41:17.000000000 +0600
+++ b/configure 2021-05-28 15:43:19.189813523 +0600
@@ -12775,7 +12775,7 @@ fi
# check for goocanvas (depends on gtk and glib)
-if pkg-config --atleast-version=2.0 goocanvas-2.0; then
- CFLAGS="$CFLAGS `pkg-config --cflags goocanvas-2.0`"
- LIBS="$LIBS `pkg-config --libs goocanvas-2.0`"
+if pkg-config --atleast-version=3.0 goocanvas-3.0; then
+ CFLAGS="$CFLAGS `pkg-config --cflags goocanvas-3.0`"
+ LIBS="$LIBS `pkg-config --libs goocanvas-3.0`"
else
- as_fn_error $? "Gpredict requires libgoocanvas-2.0-dev" "$LINENO" 5
+ as_fn_error $? "Gpredict requires libgoocanvas-3.0-dev" "$LINENO" 5
fi
@@ -13555,3 +13555,3 @@ GDK_V=`pkg-config --modversion gdk-3.0`
GTK_V=`pkg-config --modversion gtk+-3.0`
-GOOC_V=`pkg-config --modversion goocanvas-2.0`
+GOOC_V=`pkg-config --modversion goocanvas-3.0`
CURL_V=`pkg-config --modversion libcurl`
diff -Naurp1 a/configure.ac b/configure.ac
--- a/configure.ac 2017-12-29 16:28:07.000000000 +0600
+++ b/configure.ac 2021-05-28 15:44:02.553811510 +0600
@@ -47,7 +47,7 @@ fi
# check for goocanvas (depends on gtk and glib)
-if pkg-config --atleast-version=2.0 goocanvas-2.0; then
- CFLAGS="$CFLAGS `pkg-config --cflags goocanvas-2.0`"
- LIBS="$LIBS `pkg-config --libs goocanvas-2.0`"
+if pkg-config --atleast-version=3.0 goocanvas-3.0; then
+ CFLAGS="$CFLAGS `pkg-config --cflags goocanvas-3.0`"
+ LIBS="$LIBS `pkg-config --libs goocanvas-3.0`"
else
- AC_MSG_ERROR(Gpredict requires libgoocanvas-2.0-dev)
+ AC_MSG_ERROR(Gpredict requires libgoocanvas-3.0-dev)
fi
@@ -95,3 +95,3 @@ GDK_V=`pkg-config --modversion gdk-3.0`
GTK_V=`pkg-config --modversion gtk+-3.0`
-GOOC_V=`pkg-config --modversion goocanvas-2.0`
+GOOC_V=`pkg-config --modversion goocanvas-3.0`
CURL_V=`pkg-config --modversion libcurl`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment