summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2016-08-20 14:46:11 +0200
committerJeroen Roovers <jer@gentoo.org>2016-08-20 14:46:55 +0200
commitd8743c624137dc9ca657152eeefd676f751ab52b (patch)
tree026a2fd219311a3eb74dc125a51d66a5a7749f04 /media-video/frameworks/files/frameworks-0.3.7-strcmp-and-datadir.patch
parentnet-misc/aria2: Bump to 1.26.0 (diff)
downloadgentoo-d8743c624137dc9ca657152eeefd676f751ab52b.tar.gz
gentoo-d8743c624137dc9ca657152eeefd676f751ab52b.tar.bz2
gentoo-d8743c624137dc9ca657152eeefd676f751ab52b.zip
media-video/frameworks: Fix linking issue (bug #516280). Fix glade file location. Fix compiler warning.
Package-Manager: portage-2.3.0
Diffstat (limited to 'media-video/frameworks/files/frameworks-0.3.7-strcmp-and-datadir.patch')
-rw-r--r--media-video/frameworks/files/frameworks-0.3.7-strcmp-and-datadir.patch24
1 files changed, 24 insertions, 0 deletions
diff --git a/media-video/frameworks/files/frameworks-0.3.7-strcmp-and-datadir.patch b/media-video/frameworks/files/frameworks-0.3.7-strcmp-and-datadir.patch
new file mode 100644
index 00000000000..1550a211bda
--- /dev/null
+++ b/media-video/frameworks/files/frameworks-0.3.7-strcmp-and-datadir.patch
@@ -0,0 +1,24 @@
+--- a/src/interface.c
++++ b/src/interface.c
+@@ -258,8 +258,8 @@
+
+ /* find our glade interface file */
+ datadir = g_string_new(DATADIR);
+- if (datadir->str != "" || datadir->str != NULL)
+- datadir = g_string_append(datadir, "/");
++ if (strcmp(datadir->str, "") || datadir->str != NULL)
++ datadir = g_string_append(datadir, "/frameworks/");
+ filename = g_string_new("frameworks.glade");
+
+ if (g_file_test(filename->str, G_FILE_TEST_EXISTS) == TRUE) {
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -8,7 +8,7 @@
+ EXTRA_DIST = template.glade template.gladep
+
+ bin_PROGRAMS = frameworks
+-data_DATA = frameworks.glade
++pkgdata_DATA = frameworks.glade
+
+ frameworks_SOURCES = frameworks.c frameworks.h common.h videodev.h \
+ camera.c camera.h interface.c interface.h callbacks.c callbacks.h \