summaryrefslogtreecommitdiff
path: root/devel/cmake
diff options
context:
space:
mode:
authorRaphael Kubo da Costa <rakuco@FreeBSD.org>2013-09-29 14:41:11 +0000
committerRaphael Kubo da Costa <rakuco@FreeBSD.org>2013-09-29 14:41:11 +0000
commit8de8366678d29640b3420ee5dfc6f45b09fd5fd7 (patch)
tree3a94b125cc4e7c70323d150d2f66e19328b77141 /devel/cmake
parent- Update to 1.2-beta1 (diff)
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.
Notes
Notes: svn path=/head/; revision=328700
Diffstat (limited to 'devel/cmake')
-rw-r--r--devel/cmake/files/patch-Modules_FindGTK2.cmake25
1 files changed, 25 insertions, 0 deletions
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)