[SCM] camorama/master: debian/patches/: patchset updated
mfv at users.alioth.debian.org
mfv at users.alioth.debian.org
Sat Mar 5 13:11:14 UTC 2016
The following commit has been merged in the master branch:
commit 6863a67c422dbd54b5a201991f5e731f51257dee
Author: Matteo F. Vescovi <mfv at debian.org>
Date: Sat Mar 5 13:58:42 2016 +0100
debian/patches/: patchset updated
- camorama-0.19-64bit-add-filter-crash.patch added
diff --git a/debian/patches/camorama-0.19-64bit-add-filter-crash.patch b/debian/patches/camorama-0.19-64bit-add-filter-crash.patch
new file mode 100644
index 0000000..a075045
--- /dev/null
+++ b/debian/patches/camorama-0.19-64bit-add-filter-crash.patch
@@ -0,0 +1,21 @@
+diff -up camorama-0.19/src/camorama-window.c~ camorama-0.19/src/camorama-window.c
+--- camorama-0.19/src/camorama-window.c~ 2016-02-28 16:18:41.000000000 +0100
++++ camorama-0.19/src/camorama-window.c 2016-02-28 16:19:15.205579219 +0100
+@@ -42,7 +42,7 @@ static GQuark menu_item_filter_type = 0;
+
+ static void
+ add_filter_clicked(GtkMenuItem* menuitem, CamoramaFilterChain* chain) {
+- GType filter_type = GPOINTER_TO_INT(g_object_get_qdata(G_OBJECT(menuitem), menu_item_filter_type));
++ GType filter_type = GPOINTER_TO_SIZE(g_object_get_qdata(G_OBJECT(menuitem), menu_item_filter_type));
+ camorama_filter_chain_append(chain, filter_type);
+ }
+
+@@ -124,7 +124,7 @@ show_popup(cam* cam, GtkTreeView* treevi
+ }
+
+ item = gtk_menu_item_new_with_label(filter_name);
+- g_object_set_qdata(G_OBJECT(item), menu_item_filter_type, GINT_TO_POINTER(filters[i]));
++ g_object_set_qdata(G_OBJECT(item), menu_item_filter_type, GSIZE_TO_POINTER(filters[i]));
+ g_signal_connect(item, "activate",
+ G_CALLBACK(add_filter_clicked), model);
+ gtk_container_add(GTK_CONTAINER(add_filters), item);
diff --git a/debian/patches/series b/debian/patches/series
index 50ce3de..6aca02a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ S50_0.19_desktop.patch
S50_0.19_newv4l.patch
S50_0.19_versionfix.patch
desktop_file.patch
+camorama-0.19-64bit-add-filter-crash.patch
--
camorama packaging
More information about the pkg-multimedia-commits
mailing list