Commit e34c6422 authored by Nicolas Bruguier's avatar Nicolas Bruguier

Resync with elementary

parent d5f90365
switchboard-plug-security-privacy (0.1.2) xenial; urgency=medium
* New upstream release.
-- Cody Garver <cody@elementary.io> Mon, 22 May 2017 14:20:00 -0500
switchboard-plug-security-privacy (0.1.1.1) xenial; urgency=medium
* New upstream release.
......
Description: Fix use with gtk+ < 3.16
Fix use with gtk+ < 3.16.
.
switchboard-plug-security-privacy (0.1.0.1+jessie+bzr193-0+pantheon1) unstable; urgency=medium
.
* New snapshot release.
Author: gandalfn <gandalfn@club-internet.fr>
---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:
Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
--- switchboard-plug-security-privacy-0.1.0.1+jessie+bzr193.orig/src/CMakeLists.txt
+++ switchboard-plug-security-privacy-0.1.0.1+jessie+bzr193/src/CMakeLists.txt
@@ -2,6 +2,11 @@ find_package (PkgConfig)
# Add all your dependencies to the list below
pkg_check_modules (DEPS REQUIRED gthread-2.0 gtk+-3.0 switchboard-2.0 granite polkit-gobject-1 zeitgeist-2.0)
+if(${DEPS_gtk+-3.0_VERSION} VERSION_GREATER 3.16 OR ${DEPS_gtk+-3.0_VERSION} VERSION_EQUAL 3.16)
+ set(VALA_DEFINED_VAR "--define=HAVE_GTK_3_16")
+else()
+ set(VALA_DEFINED_VAR "")
+endif()
add_definitions (${DEPS_CFLAGS})
link_directories (${DEPS_LIBRARY_DIRS})
--- switchboard-plug-security-privacy-0.1.0.1+jessie+bzr193.orig/src/FirewallPanel.vala
+++ switchboard-plug-security-privacy-0.1.0.1+jessie+bzr193/src/FirewallPanel.vala
@@ -157,7 +157,11 @@ public class SecurityPrivacy.FirewallPan
add_popover.add (popover_grid);
var policy_label = new Gtk.Label (_("Action:"));
+#if HAVE_GTK_3_16
policy_label.xalign = 1;
+#else
+ policy_label.halign = Gtk.Align.END;
+#endif
var policy_combobox = new Gtk.ComboBoxText ();
policy_combobox.append_text (_("Allow"));
policy_combobox.append_text (_("Deny"));
@@ -166,21 +170,33 @@ public class SecurityPrivacy.FirewallPan
policy_combobox.active = 0;
var protocol_label = new Gtk.Label (_("Protocol:"));
+#if HAVE_GTK_3_16
protocol_label.xalign = 1;
+#else
+ protocol_label.halign = Gtk.Align.END;
+#endif
var protocol_combobox = new Gtk.ComboBoxText ();
protocol_combobox.append_text ("TCP");
protocol_combobox.append_text ("UDP");
protocol_combobox.active = 0;
var direction_label = new Gtk.Label (_("Direction:"));
+#if HAVE_GTK_3_16
direction_label.xalign = 1;
+#else
+ direction_label.halign = Gtk.Align.END;
+#endif
var direction_combobox = new Gtk.ComboBoxText ();
direction_combobox.append_text (_("In"));
direction_combobox.append_text (_("Out"));
direction_combobox.active = 0;
var ports_label = new Gtk.Label (_("Ports:"));
+#if HAVE_GTK_3_16
ports_label.xalign = 1;
+#else
+ ports_label.halign = Gtk.Align.END;
+#endif
var ports_entry = new Gtk.Entry ();
ports_entry.input_purpose = Gtk.InputPurpose.NUMBER;
ports_entry.placeholder_text = _("%d or %d-%d").printf (80, 80, 85);
--- switchboard-plug-security-privacy-0.1.0.1+jessie+bzr193.orig/src/TrackPanel.vala
+++ switchboard-plug-security-privacy-0.1.0.1+jessie+bzr193/src/TrackPanel.vala
@@ -406,7 +406,11 @@ public class SecurityPrivacy.TrackPanel
scrolled.add (view);
var record_label = new Gtk.Label (_("Data Sources:"));
+#if HAVE_GTK_3_16
record_label.xalign = 0;
+#else
+ record_label.halign = Gtk.Align.START;
+#endif
record_grid = new Gtk.Grid ();
record_grid.row_spacing = 6;
@@ -517,7 +521,11 @@ public class SecurityPrivacy.TrackPanel
frame_grid.add (list_toolbar);
var record_label = new Gtk.Label (_("Do not collect data from the following:"));
+#if HAVE_GTK_3_16
record_label.xalign = 0;
+#else
+ record_label.halign = Gtk.Align.START;
+#endif
exclude_grid = new Gtk.Grid ();
exclude_grid.row_spacing = 6;
fix-build-with-gtk-3.14.patch
......@@ -12,5 +12,8 @@
%:
dh $@
override_dh_install:
dh_install --fail-missing
override_dh_strip:
dh_strip --dbg-package=switchboard-plug-security-privacy-dbg
usr/lib/*/switchboard/personal/
usr/share/locale
usr/share/polkit-1/actions/
usr/share/glib-2.0/
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment