diff options
| author | rakuco <rakuco@FreeBSD.org> | 2013-09-29 22:41:11 +0800 |
|---|---|---|
| committer | rakuco <rakuco@FreeBSD.org> | 2013-09-29 22:41:11 +0800 |
| commit | 0629a19c1391187908ee95d0bdb7229162fcfcda (patch) | |
| tree | 3a94b125cc4e7c70323d150d2f66e19328b77141 /devel | |
| parent | f56222c14160a75ce244b0edd5b77ee164117628 (diff) | |
| download | freebsd-ports-gnome-0629a19c1391187908ee95d0bdb7229162fcfcda.tar.gz freebsd-ports-gnome-0629a19c1391187908ee95d0bdb7229162fcfcda.tar.zst freebsd-ports-gnome-0629a19c1391187908ee95d0bdb7229162fcfcda.zip | |
Add some patches to FindGTK2.cmake that will be in the next release.
At least audio/jack-keyboard is failing to link on 10-CURRENT after the
linker stopped pulling indirect dependencies. Add this patch in order to
link directly against gthread when linking against gtk2.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/cmake-modules/Makefile | 2 | ||||
| -rw-r--r-- | devel/cmake/files/patch-Modules_FindGTK2.cmake | 25 |
2 files changed, 26 insertions, 1 deletions
diff --git a/devel/cmake-modules/Makefile b/devel/cmake-modules/Makefile index 2a1a1a2000d6..c6f1f0b3b6b0 100644 --- a/devel/cmake-modules/Makefile +++ b/devel/cmake-modules/Makefile @@ -1,7 +1,7 @@ # Created by: gahr # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= -modules LATEST_LINK= cmake-modules diff --git a/devel/cmake/files/patch-Modules_FindGTK2.cmake b/devel/cmake/files/patch-Modules_FindGTK2.cmake new file mode 100644 index 000000000000..ce343d6d0e57 --- /dev/null +++ b/devel/cmake/files/patch-Modules_FindGTK2.cmake @@ -0,0 +1,25 @@ +commit 508e8ca024e47baea342da85c7bbd014c7fd6c30 +Author: Daniele E. Domenichelli <ddomenichelli@kde.org> +Date: Mon Jun 17 17:31:10 2013 +0200 + + FindGTK2: Detect gthread library + +commit 76c72b9f14258933e4cf810da275bd2b931c5ac9 +Author: Daniele E. Domenichelli <daniele.domenichelli@iit.it> +Date: Wed Jul 31 17:39:38 2013 +0200 + + FindGTK2: gthread-2.0 folder does not exist + + Partially revert commit 508e8ca024e47baea342da85c7bbd014c7fd6c30 + +--- Modules/FindGTK2.cmake.orig 2013-09-29 17:29:09.000000000 +0300 ++++ Modules/FindGTK2.cmake 2013-09-29 17:29:42.000000000 +0300 +@@ -463,6 +463,8 @@ + _GTK2_FIND_INCLUDE_DIR(GTK2_GDK_PIXBUF_INCLUDE_DIR gdk-pixbuf/gdk-pixbuf.h) + _GTK2_FIND_LIBRARY (GTK2_GDK_PIXBUF_LIBRARY gdk_pixbuf false true) + ++ _GTK2_FIND_LIBRARY (GTK2_GTHREAD_LIBRARY gthread false true) ++ + _GTK2_FIND_LIBRARY (GTK2_GIO_LIBRARY gio false true) + + _GTK2_FIND_INCLUDE_DIR(GTK2_ATK_INCLUDE_DIR atk/atk.h) |