← Back to branch summary

~ubuntu-desktop/gnome-control-center/328

« back to all changes in this revision

Viewing changes to debian/patches/71_ubuntu_dock_settings.patch

  • Committer: jbicha at ubuntu
  • Date: 2018-02-17 18:33:55 UTC
  • Revision ID: jbicha@ubuntu.com-20180217183355-qe3ib71s87eza3le
* New upstream release (LP: #1750174)
* Build with meson
* Bump Build-Depends on gsettings-desktop-schemas-dev to 3.27.2
* Build-Depend on policykit-1 for itstool rules
* Bump debhelper compat to 11
* Refresh patches
* Update connectivity-switch.patch with latest version proposed to GNOME
* Drop patches applied in new release:
  - gnome-desktop327.patch
  - search-provider-locale.patch
* Disable patches that need to be rebased:
  - 70_allow_sound_above_100.patch
  - 71_ubuntu_dock_settings.patch
* Add git_fix-app-icon-install.patch and list it in
  debian/source/include-binaries

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/71_ubuntu_dock_settings.patch
8
8
Author: didrocks@ubuntu.com
9
9
Forwarded: not-needed
10
10
 
11
 
Index: gnome-control-center-3.26.1/configure.ac
12
 
===================================================================
13
 
--- gnome-control-center-3.26.1.orig/configure.ac
14
 
+++ gnome-control-center-3.26.1/configure.ac
15
 
@@ -162,6 +162,7 @@ PKG_CHECK_MODULES(SOUND_PANEL, $COMMON_M
16
 
                   libcanberra-gtk3 >= $CANBERRA_REQUIRED_VERSION
17
 
                   libpulse >= $PA_REQUIRED_VERSION
18
 
                   libpulse-mainloop-glib >= $PA_REQUIRED_VERSION)
19
 
+PKG_CHECK_MODULES(UBUNTU_PANEL, $COMMON_MODULES)
20
 
 PKG_CHECK_MODULES(UNIVERSAL_ACCESS_PANEL, $COMMON_MODULES)
21
 
 PKG_CHECK_MODULES(USER_ACCOUNTS_PANEL, $COMMON_MODULES
22
 
                   polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
23
 
@@ -548,6 +549,8 @@ panels/network/gnome-network-panel.deskt
24
 
 panels/network/gnome-wifi-panel.desktop.in
25
 
 panels/notifications/Makefile
26
 
 panels/notifications/gnome-notifications-panel.desktop.in
27
 
+panels/ubuntu/Makefile
28
 
+panels/ubuntu/gnome-ubuntu-panel.desktop.in
29
 
 panels/universal-access/Makefile
30
 
 panels/universal-access/gnome-universal-access-panel.desktop.in
31
 
 panels/user-accounts/Makefile
32
 
Index: gnome-control-center-3.26.1/panels/Makefile.am
33
 
===================================================================
34
 
--- gnome-control-center-3.26.1.orig/panels/Makefile.am
35
 
+++ gnome-control-center-3.26.1/panels/Makefile.am
36
 
@@ -17,7 +17,8 @@ SUBDIRS= \
37
 
        search \
38
 
        privacy \
39
 
        sharing \
40
 
-       printers
41
 
+       printers \
42
 
+       ubuntu
43
 
 
44
 
 if BUILD_WACOM
45
 
 SUBDIRS += wacom
46
 
Index: gnome-control-center-3.26.1/panels/ubuntu/Makefile.am
47
 
===================================================================
48
 
--- /dev/null
49
 
+++ gnome-control-center-3.26.1/panels/ubuntu/Makefile.am
50
 
@@ -0,0 +1,43 @@
51
 
+cappletname = ubuntu
52
 
+
53
 
+AM_CPPFLAGS =                                          \
54
 
+       $(PANEL_CFLAGS)                                 \
55
 
+       $(UBUNTU_PANEL_CFLAGS)                          \
56
 
+       -DGNOMELOCALEDIR="\"$(datadir)/locale\""        \
57
 
+       -DDATADIR="\"$(datadir)\""                      \
58
 
+       -I$(top_srcdir)/panels/common/                  \
59
 
+       $(NULL)
60
 
+
61
 
+noinst_LTLIBRARIES = libubuntu.la
62
 
+
63
 
+BUILT_SOURCES =                        \
64
 
+       cc-ubuntu-resources.c   \
65
 
+       cc-ubuntu-resources.h
66
 
+
67
 
+libubuntu_la_SOURCES =         \
68
 
+       $(BUILT_SOURCES)        \
69
 
+       cc-ubuntu-panel.c       \
70
 
+       cc-ubuntu-panel.h
71
 
+
72
 
+libubuntu_la_LIBADD = $(PANEL_LIBS) $(UBUNTU_PANEL_LIBS)
73
 
+
74
 
+resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --sourcedir=$(srcdir)/icons --generate-dependencies $(srcdir)/ubuntu.gresource.xml)
75
 
+cc-ubuntu-resources.c: ubuntu.gresource.xml $(resource_files)
76
 
+       $(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --sourcedir=$(srcdir)/icons --generate-source --c-name cc_ubuntu $<
77
 
+cc-ubuntu-resources.h: ubuntu.gresource.xml $(resource_files)
78
 
+       $(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --sourcedir=$(srcdir)/icons --generate-header --c-name cc_ubuntu $<
79
 
+
80
 
+# You will need a recent intltool or the patch from this bug
81
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=462312
82
 
+@INTLTOOL_POLICY_RULE@
83
 
+
84
 
+@INTLTOOL_DESKTOP_RULE@
85
 
+
86
 
+desktopdir = $(datadir)/applications
87
 
+Desktop_in_files = gnome-ubuntu-panel.desktop.in
88
 
+desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
89
 
+
90
 
+CLEANFILES = $(Desktop_in_files) $(desktop_DATA) $(BUILT_SOURCES)
91
 
+EXTRA_DIST = $(resource_files) ubuntu.gresource.xml
92
 
+
93
 
+-include $(top_srcdir)/git.mk
94
 
Index: gnome-control-center-3.26.1/panels/ubuntu/cc-ubuntu-panel.c
95
 
===================================================================
96
 
--- /dev/null
97
 
+++ gnome-control-center-3.26.1/panels/ubuntu/cc-ubuntu-panel.c
 
11
---
 
12
 panels/meson.build                             |    1 
 
13
 panels/ubuntu/cc-ubuntu-panel.c                |  442 +++++++++++++++++++++++++
 
14
 panels/ubuntu/cc-ubuntu-panel.h                |   39 ++
 
15
 panels/ubuntu/gnome-ubuntu-panel.desktop.in.in |   17 
 
16
 panels/ubuntu/meson.build                      |   38 ++
 
17
 panels/ubuntu/ubuntu.ui                        |  100 +++++
 
18
 po/POTFILES.in                                 |    4 
 
19
 shell/cc-panel-list.c                          |    1 
 
20
 shell/cc-panel-loader.c                        |    2 
 
21
 shell/window.ui                                |    2 
 
22
 10 files changed, 645 insertions(+), 1 deletion(-)
 
23
 
 
24
--- a/panels/meson.build
 
25
+++ b/panels/meson.build
 
26
@@ -17,6 +17,7 @@ panels = [
 
27
   'search',
 
28
   'sharing',
 
29
   'sound',
 
30
+  'ubuntu',
 
31
   'universal-access',
 
32
   'user-accounts'
 
33
 ]
 
34
--- /dev/null
 
35
+++ b/panels/ubuntu/cc-ubuntu-panel.c
98
36
@@ -0,0 +1,442 @@
99
37
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
100
38
+/*
538
476
+  object_class->dispose = cc_ubuntu_panel_dispose;
539
477
+  object_class->finalize = cc_ubuntu_panel_finalize;
540
478
+}
541
 
Index: gnome-control-center-3.26.1/panels/ubuntu/cc-ubuntu-panel.h
542
 
===================================================================
543
479
--- /dev/null
544
 
+++ gnome-control-center-3.26.1/panels/ubuntu/cc-ubuntu-panel.h
 
480
+++ b/panels/ubuntu/cc-ubuntu-panel.h
545
481
@@ -0,0 +1,39 @@
546
482
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
547
483
+/*
582
518
+G_END_DECLS
583
519
+
584
520
+#endif /* _CC_EDIT_DIALOG_H_ */
585
 
Index: gnome-control-center-3.26.1/panels/ubuntu/gnome-ubuntu-panel.desktop.in.in
586
 
===================================================================
587
521
--- /dev/null
588
 
+++ gnome-control-center-3.26.1/panels/ubuntu/gnome-ubuntu-panel.desktop.in.in
 
522
+++ b/panels/ubuntu/gnome-ubuntu-panel.desktop.in.in
589
523
@@ -0,0 +1,17 @@
590
524
+[Desktop Entry]
591
525
+# Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
604
538
+X-GNOME-Bugzilla-Version=@VERSION@
605
539
+# Translators: those are keywords for the ubuntu control-center panel
606
540
+_Keywords=Dock;Launcher;
607
 
Index: gnome-control-center-3.26.1/panels/ubuntu/ubuntu.gresource.xml
608
 
===================================================================
609
 
--- /dev/null
610
 
+++ gnome-control-center-3.26.1/panels/ubuntu/ubuntu.gresource.xml
611
 
@@ -0,0 +1,7 @@
612
 
+<?xml version="1.0" encoding="UTF-8"?>
613
 
+<gresources>
614
 
+  <gresource prefix="/org/gnome/control-center/ubuntu">
615
 
+    <file preprocess="xml-stripblanks">ubuntu.ui</file>
616
 
+  </gresource>
617
 
+</gresources>
618
 
+
619
 
Index: gnome-control-center-3.26.1/panels/ubuntu/ubuntu.ui
620
 
===================================================================
621
 
--- /dev/null
622
 
+++ gnome-control-center-3.26.1/panels/ubuntu/ubuntu.ui
 
541
--- /dev/null
 
542
+++ b/panels/ubuntu/meson.build
 
543
@@ -0,0 +1,38 @@
 
544
+panels_list += cappletname
 
545
+desktop = 'gnome-@0@-panel.desktop'.format(cappletname)
 
546
+
 
547
+desktop_in = configure_file(
 
548
+  input: desktop + '.in.in',
 
549
+  output: desktop + '.in',
 
550
+  configuration: desktop_conf
 
551
+)
 
552
+
 
553
+i18n.merge_file(
 
554
+  desktop,
 
555
+  type: 'desktop',
 
556
+  input: desktop_in,
 
557
+  output: desktop,
 
558
+  po_dir: po_dir,
 
559
+  install: true,
 
560
+  install_dir: control_center_desktopdir
 
561
+)
 
562
+
 
563
+resource_data = files('ubuntu.ui')
 
564
+
 
565
+resources = gnome.compile_resources(
 
566
+  'cc-' + cappletname + '-resources',
 
567
+  cappletname + '.gresource.xml',
 
568
+  c_name: 'cc_' + cappletname,
 
569
+  dependencies: resource_data,
 
570
+  export: true
 
571
+)
 
572
+
 
573
+cflags += '-DGNOMELOCALEDIR="@0@"'.format(control_center_localedir)
 
574
+
 
575
+panels_libs += static_library(
 
576
+  cappletname,
 
577
+  sources: sources,
 
578
+  include_directories: [top_inc, common_inc],
 
579
+  dependencies: common_deps,
 
580
+  c_args: cflags
 
581
+)
 
582
--- /dev/null
 
583
+++ b/panels/ubuntu/ubuntu.ui
623
584
@@ -0,0 +1,100 @@
624
585
+<?xml version="1.0" encoding="UTF-8"?>
625
586
+<!-- Generated with glade 3.20.0 -->
721
682
+    </child>
722
683
+  </object>
723
684
+</interface>
724
 
Index: gnome-control-center-3.26.1/shell/Makefile.am
725
 
===================================================================
726
 
--- gnome-control-center-3.26.1.orig/shell/Makefile.am
727
 
+++ gnome-control-center-3.26.1/shell/Makefile.am
728
 
@@ -94,6 +94,7 @@ gnome_control_center_LDADD =                                          \
729
 
        $(top_builddir)/panels/search/libsearch.la                      \
730
 
        $(top_builddir)/panels/sharing/libsharing.la                    \
731
 
        $(top_builddir)/panels/sound/libsound.la                        \
732
 
+       $(top_builddir)/panels/ubuntu/libubuntu.la                      \
733
 
        $(top_builddir)/panels/universal-access/libuniversal-access.la  \
734
 
        $(top_builddir)/panels/user-accounts/libuser-accounts.la        \
735
 
        $(top_builddir)/panels/printers/libprinters.la
736
 
Index: gnome-control-center-3.26.1/shell/cc-panel-list.c
737
 
===================================================================
738
 
--- gnome-control-center-3.26.1.orig/shell/cc-panel-list.c
739
 
+++ gnome-control-center-3.26.1/shell/cc-panel-list.c
740
 
@@ -267,6 +267,7 @@ static const gchar * const panel_order[]
 
685
--- a/po/POTFILES.in
 
686
+++ b/po/POTFILES.in
 
687
@@ -183,6 +183,10 @@ panels/sound/gvc-mixer-dialog.c
 
688
 panels/sound/gvc-sound-theme-chooser.c
 
689
 panels/sound/gvc-speaker-test.c
 
690
 panels/sound/sound-theme-file-utils.c
 
691
+panels/ubuntu/cc-ubuntu-panel.c
 
692
+panels/ubuntu/gnome-ubuntu-panel.desktop.in
 
693
+panels/ubuntu/gnome-ubuntu-panel.desktop.in.in
 
694
+panels/ubuntu/ubuntu.ui
 
695
 panels/universal-access/cc-ua-panel.c
 
696
 panels/universal-access/gnome-universal-access-panel.desktop.in.in
 
697
 panels/universal-access/uap.ui
 
698
--- a/shell/cc-panel-list.c
 
699
+++ b/shell/cc-panel-list.c
 
700
@@ -277,6 +277,7 @@ static const gchar * const panel_order[]
741
701
   "mobile-broadband",
742
702
   "bluetooth",
743
703
   "background",
745
705
   "notifications",
746
706
   "search",
747
707
   "region",
748
 
Index: gnome-control-center-3.26.1/po/POTFILES.in
749
 
===================================================================
750
 
--- gnome-control-center-3.26.1.orig/po/POTFILES.in
751
 
+++ gnome-control-center-3.26.1/po/POTFILES.in
752
 
@@ -189,6 +189,10 @@ panels/sound/gvc-mixer-dialog.c
753
 
 panels/sound/gvc-sound-theme-chooser.c
754
 
 panels/sound/gvc-speaker-test.c
755
 
 panels/sound/sound-theme-file-utils.c
756
 
+panels/ubuntu/cc-ubuntu-panel.c
757
 
+panels/ubuntu/gnome-ubuntu-panel.desktop.in
758
 
+panels/ubuntu/gnome-ubuntu-panel.desktop.in.in
759
 
+[type: gettext/glade]panels/ubuntu/ubuntu.ui
760
 
 panels/universal-access/cc-ua-panel.c
761
 
 panels/universal-access/gnome-universal-access-panel.desktop.in.in
762
 
 [type: gettext/glade]panels/universal-access/uap.ui
763
 
Index: gnome-control-center-3.26.1/shell/cc-panel-loader.c
764
 
===================================================================
765
 
--- gnome-control-center-3.26.1.orig/shell/cc-panel-loader.c
766
 
+++ gnome-control-center-3.26.1/shell/cc-panel-loader.c
767
 
@@ -56,6 +56,7 @@ extern GType cc_search_panel_get_type (v
 
708
--- a/shell/cc-panel-loader.c
 
709
+++ b/shell/cc-panel-loader.c
 
710
@@ -55,6 +55,7 @@ extern GType cc_search_panel_get_type (v
768
711
 extern GType cc_sharing_panel_get_type (void);
769
712
 extern GType cc_sound_panel_get_type (void);
770
713
 extern GType cc_ua_panel_get_type (void);
772
715
 extern GType cc_user_panel_get_type (void);
773
716
 #ifdef BUILD_WACOM
774
717
 extern GType cc_wacom_panel_get_type (void);
775
 
@@ -101,6 +102,7 @@ static struct {
 
718
@@ -99,6 +100,7 @@ static struct {
776
719
   PANEL_TYPE("search",           cc_search_panel_get_type       ),
777
720
   PANEL_TYPE("sharing",          cc_sharing_panel_get_type      ),
778
721
   PANEL_TYPE("sound",            cc_sound_panel_get_type        ),
780
723
   PANEL_TYPE("universal-access", cc_ua_panel_get_type           ),
781
724
   PANEL_TYPE("user-accounts",    cc_user_panel_get_type         ),
782
725
 #ifdef BUILD_WACOM
783
 
Index: gnome-control-center-3.26.1/shell/window.ui
784
 
===================================================================
785
 
--- gnome-control-center-3.26.1.orig/shell/window.ui
786
 
+++ gnome-control-center-3.26.1/shell/window.ui
 
726
--- a/shell/window.ui
 
727
+++ b/shell/window.ui
787
728
@@ -5,7 +5,7 @@
788
729
     <property name="can_focus">False</property>
789
730
     <property name="window_position">center</property>
792
733
+    <property name="default-height">669</property>
793
734
     <signal name="notify::window" handler="gdk_window_set_cb" object="CcWindow" swapped="no" />
794
735
     <signal name="map-event" handler="window_map_event_cb" object="CcWindow" swapped="no" />
795
 
     <child>
 
736
     <signal name="key-press-event" handler="window_key_press_event_cb" object="CcWindow" swapped="no" after="yes" />