From 2469263a61ea8ee901f358ed4257433dfae6f2b3 Mon Sep 17 00:00:00 2001 From: Que Quotion Date: Wed, 7 Mar 2018 01:42:48 +0900 Subject: [PATCH] wingpanel-standalone-git: Autohide: See https://github.com/elementary/wingpanel/pull/93 --- wingpanel-standalone-git/.SRCINFO | 12 +- wingpanel-standalone-git/PKGBUILD | 27 +-- wingpanel-standalone-git/autohide-evbox.patch | 156 -------------- wingpanel-standalone-git/autohide.patch | 197 ++++++++++++++++++ .../minus-backgroundmanager.patch | 80 +++++-- .../minus-galaplugin.patch | 40 ++-- 6 files changed, 304 insertions(+), 208 deletions(-) delete mode 100644 wingpanel-standalone-git/autohide-evbox.patch create mode 100644 wingpanel-standalone-git/autohide.patch diff --git a/wingpanel-standalone-git/.SRCINFO b/wingpanel-standalone-git/.SRCINFO index 1f5f291..b15795a 100644 --- a/wingpanel-standalone-git/.SRCINFO +++ b/wingpanel-standalone-git/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = wingpanel-standalone-git pkgdesc = Stylish top panel that holds indicators and spawns an application launcher (without Gala dependencies) - pkgver = r345.ec08fc6 - pkgrel = 2 + pkgver = r346.61c4f9f + pkgrel = 1 url = https://github.com/elementary/wingpanel arch = i686 arch = x86_64 @@ -45,13 +45,13 @@ pkgbase = wingpanel-standalone-git source = minus-galaplugin.patch source = minus-gala.patch source = y-is-broken-cogl.patch - source = autohide-evbox.patch + source = autohide.patch sha256sums = SKIP - sha256sums = 4d413e38bdb0dc408dbbe115c0cf192172dd5efb8a8e28b2b2a2c809f6bf7f5c - sha256sums = 49e077acacfec80696a3ec29f13ed1e3c7cdcae54b53a419f5e9bc853c4684e3 + sha256sums = 37b3853f5e8a84a4d86c392beb0b422e03c71c7c53519f49883bfa5550979ae8 + sha256sums = e56bc3b154539b6ae2ca7494f46f6f68c55f167b73203b92d645839bf8e9a5ea sha256sums = 47934e9aff119cedcfe7d184078ad60d3d715e07f1ca7cb1715e50b2e0c517e8 sha256sums = b1902c1d44ac546df63cd0224a7d2ef2cb6394ca556512c30c370d387db7bbab - sha256sums = 548ae13c920e61ba9a479b0a9bb200575b5cbd8e3218aebec3486e7f95ef3213 + sha256sums = 619224ba9cf360d65f67c3865b00194d19471e25503da296796be209290e300e pkgname = wingpanel-standalone-git diff --git a/wingpanel-standalone-git/PKGBUILD b/wingpanel-standalone-git/PKGBUILD index 457216d..8d1d654 100644 --- a/wingpanel-standalone-git/PKGBUILD +++ b/wingpanel-standalone-git/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: Maxime Gauduin pkgname=wingpanel-standalone-git -pkgver=r345.ec08fc6 -pkgrel=2 +pkgver=r346.61c4f9f +pkgrel=1 pkgdesc='Stylish top panel that holds indicators and spawns an application launcher (without Gala dependencies)' arch=('i686' 'x86_64') url='https://github.com/elementary/wingpanel' @@ -27,13 +27,13 @@ source=('git+https://github.com/elementary/wingpanel.git' 'minus-galaplugin.patch' 'minus-gala.patch' 'y-is-broken-cogl.patch' - 'autohide-evbox.patch') + 'autohide.patch') sha256sums=('SKIP' - '4d413e38bdb0dc408dbbe115c0cf192172dd5efb8a8e28b2b2a2c809f6bf7f5c' - '49e077acacfec80696a3ec29f13ed1e3c7cdcae54b53a419f5e9bc853c4684e3' + '37b3853f5e8a84a4d86c392beb0b422e03c71c7c53519f49883bfa5550979ae8' + 'e56bc3b154539b6ae2ca7494f46f6f68c55f167b73203b92d645839bf8e9a5ea' '47934e9aff119cedcfe7d184078ad60d3d715e07f1ca7cb1715e50b2e0c517e8' 'b1902c1d44ac546df63cd0224a7d2ef2cb6394ca556512c30c370d387db7bbab' - '548ae13c920e61ba9a479b0a9bb200575b5cbd8e3218aebec3486e7f95ef3213') + '619224ba9cf360d65f67c3865b00194d19471e25503da296796be209290e300e') pkgver() { cd wingpanel @@ -44,20 +44,21 @@ pkgver() { prepare() { cd wingpanel - #autohide - msg2 "autohide" - patch -Np2 < ../autohide-evbox.patch + #Autohide + msg2 "Autohide" + patch -Np2 < ../autohide.patch + #patch -Np2 < ../autohide-testing.patch #Standalone patches - msg2 "minus background manager" + msg2 "Remove background manager (Gala dependent)" patch -Np2 < ../minus-backgroundmanager.patch - msg2 "minus gala plugin" + msg2 "Remove Gala plugin" patch -Np2 < ../minus-galaplugin.patch - msg2 "minus gala" + msg2 "Remove Gala dependency" patch -Np2 < ../minus-gala.patch #Cogl can't be found when not using gala's cmake package; wtf? - msg2 "minus cogl" + msg2 "Remove CoglFixes (broken)" patch -Np2 < ../y-is-broken-cogl.patch if [[ -d build ]]; then diff --git a/wingpanel-standalone-git/autohide-evbox.patch b/wingpanel-standalone-git/autohide-evbox.patch deleted file mode 100644 index e5a8cee..0000000 --- a/wingpanel-standalone-git/autohide-evbox.patch +++ /dev/null @@ -1,156 +0,0 @@ ---- src/wingpanel/schemas/org.pantheon.desktop.wingpanel.gschema.xml 2017-12-26 14:53:03.354809958 +0900 -+++ src/wingpanel/schemas/org.pantheon.desktop.wingpanel.gschema.xml.new 2018-01-21 23:41:18.703206040 +0900 -@@ -6,5 +6,10 @@ - Sets if the panel uses transparency. - Disable this to provide higher contrasts and make indicators better readable. - -+ -+ false -+ Sets if the panel will autohide. -+ Enable this to increase available desktop area and reduce clutter. -+ - - ---- src/wingpanel/src/Services/Settings.vala 2017-12-26 14:53:03.354809958 +0900 -+++ src/wingpanel/src/Services/Settings.vala.new 2018-01-21 23:46:25.919860486 +0900 -@@ -23,6 +23,8 @@ - - public bool use_transparency { get; set; } - -+ public bool autohide { get; set; } -+ - public PanelSettings () { - base ("org.pantheon.desktop.wingpanel"); - } ---- src/wingpanel/src/PanelWindow.vala 2017-06-01 02:18:32.090889031 +0900 -+++ src/wingpanel/src/PanelWindow.vala.patched 2017-06-01 02:11:40.814767918 +0900 -@@ -22,4 +22,9 @@ - - private Widgets.Panel panel; -+ -+ private Gtk.EventBox box; -+ -+ uint timeout; -+ - private int monitor_number; - private int monitor_width; -@@ -35,6 +35,7 @@ - private bool expanded = false; - private int panel_displacement; - private uint shrink_timeout = 0; -+ private bool autohide = Services.PanelSettings.get_default ().autohide; - - public PanelWindow (Gtk.Application application) { - Object ( -@@ -61,6 +61,9 @@ - update_visual (); - - popover_manager = new Services.PopoverManager (this); -+ -+ box = new Gtk.EventBox(); -+ box.add_events (Gdk.EventMask.ENTER_NOTIFY_MASK | Gdk.EventMask.LEAVE_NOTIFY_MASK); - - panel = new Widgets.Panel (popover_manager); - panel.realize.connect (on_realize); -@@ -80,17 +83,40 @@ - application.add_accelerator ("Tab", "app.cycle", null); - application.add_accelerator ("Tab", "app.cycle-back", null); - -- add (panel); -+ box.add(panel); -+ if (autohide == true) { -+ box.enter_notify_event.connect (reactivate); -+ box.leave_notify_event.connect (on_idle); -+ } -+ -+ add (box); - } - - private bool animation_step () { - if (panel_displacement <= panel_height * (-1)) { -+ timeout = 0; - return false; - } - - panel_displacement--; - -+ if (autohide == false) { -- update_panel_dimensions (); -+ update_panel_dimensions (); -+ } -+ animate_panel (); -+ -+ return true; -+ } -+ -+ private bool animation_unstep () { -+ if (panel_displacement >= -1 || popover_manager.current_indicator != null) { -+ timeout = 0; -+ return false; -+ } -+ -+ panel_displacement++; -+ -+ animate_panel (); - - return true; - } -@@ -85,7 +110,32 @@ - - Services.BackgroundManager.get_default ().initialize (this.monitor_number, panel_height); - -- Timeout.add (300 / panel_height, animation_step); -+ if (autohide == false) { -+ timeout = Timeout.add (300 / panel_height, animation_step); -+ } else { -+ panel_displacement--; -+ animate_panel (); -+ } -+ } -+ -+ private bool on_idle () { -+ if (timeout > 0) { -+ Source.remove (timeout); -+ } -+ -+ timeout = Timeout.add (100 / panel_height, animation_unstep); -+ -+ return true; -+ } -+ -+ private bool reactivate () { -+ if (timeout > 0) { -+ Source.remove (timeout); -+ } -+ -+ timeout = Timeout.add (100 / panel_height, animation_step); -+ -+ return true; - } - - private void update_panel_dimensions () { -@@ -108,6 +153,24 @@ - update_struts (); - } - -+ private void animate_panel () { -+ panel_height = panel.get_allocated_height (); -+ -+ monitor_number = screen.get_primary_monitor (); -+ Gdk.Rectangle monitor_dimensions; -+ this.screen.get_monitor_geometry (monitor_number, out monitor_dimensions); -+ -+ monitor_width = monitor_dimensions.width; -+ monitor_height = monitor_dimensions.height; -+ -+ this.set_size_request (monitor_width, (popover_manager.current_indicator != null ? monitor_height : -1)); -+ -+ monitor_x = monitor_dimensions.x; -+ monitor_y = monitor_dimensions.y; -+ -+ this.move (monitor_x, monitor_y - (panel_height + panel_displacement)); -+ } -+ - private void update_visual () { - var visual = this.screen.get_rgba_visual (); - diff --git a/wingpanel-standalone-git/autohide.patch b/wingpanel-standalone-git/autohide.patch new file mode 100644 index 0000000..c0db045 --- /dev/null +++ b/wingpanel-standalone-git/autohide.patch @@ -0,0 +1,197 @@ +diff --git a/wingpanel/schemas/org.pantheon.desktop.wingpanel.gschema.xml b/wingpanel-qq/schemas/org.pantheon.desktop.wingpanel.gschema.xml +index c81abd5..890e277 100644 +--- a/wingpanel/schemas/org.pantheon.desktop.wingpanel.gschema.xml ++++ b/wingpanel-qq/schemas/org.pantheon.desktop.wingpanel.gschema.xml +@@ -6,5 +6,15 @@ + Sets if the panel uses transparency. + Disable this to provide higher contrasts and make indicators better readable. + ++ ++ ++ ++ ++ ++ ++ 'Disabled' ++ Sets if and how the panel will autohide. ++ Enable this to increase available desktop area and reduce clutter. ++ + + +diff --git a/wingpanel/src/PanelWindow.vala b/wingpanel-qq/src/PanelWindow.vala +index c48b5ea..81ec2f2 100644 +--- a/wingpanel/src/PanelWindow.vala ++++ b/wingpanel-qq/src/PanelWindow.vala +@@ -21,6 +21,9 @@ public class Wingpanel.PanelWindow : Gtk.Window { + public Services.PopoverManager popover_manager; + + private Widgets.Panel panel; ++ ++ uint timeout; ++ + private int monitor_number; + private int monitor_width; + private int monitor_height; +@@ -30,6 +33,9 @@ public class Wingpanel.PanelWindow : Gtk.Window { + private bool expanded = false; + private int panel_displacement; + private uint shrink_timeout = 0; ++ private bool hiding = false; ++ private bool restrut = true; ++ private string autohide = Services.PanelSettings.get_default ().autohide; + + public PanelWindow (Gtk.Application application) { + Object ( +@@ -52,6 +58,8 @@ public class Wingpanel.PanelWindow : Gtk.Window { + this.screen.size_changed.connect (update_panel_dimensions); + this.screen.monitors_changed.connect (update_panel_dimensions); + this.screen_changed.connect (update_visual); ++ this.enter_notify_event.connect (show_panel); ++ this.leave_notify_event.connect (hide_panel); + + update_visual (); + +@@ -71,17 +79,33 @@ public class Wingpanel.PanelWindow : Gtk.Window { + application.add_accelerator ("Tab", "app.cycle", null); + application.add_accelerator ("Tab", "app.cycle-back", null); + ++ Services.PanelSettings.get_default ().notify["autohide"].connect (() => { ++ autohide = Services.PanelSettings.get_default ().autohide; ++ update_autohide_mode (); ++ }); ++ + add (panel); + } + + private bool animation_step () { +- if (panel_displacement <= panel_height * (-1)) { +- return false; ++ if (hiding != true) { ++ if (panel_displacement <= panel_height * (-1)) { ++ timeout = 0; ++ return false; ++ } ++ panel_displacement--; ++ } else { ++ if (panel_displacement >= -1 || popover_manager.current_indicator != null) { ++ timeout = 0; ++ return false; ++ } ++ panel_displacement++; + } + +- panel_displacement--; +- +- update_panel_dimensions (); ++ if (restrut == true) { ++ update_panel_dimensions (); ++ } ++ animate_panel (); + + return true; + } +@@ -91,7 +115,65 @@ public class Wingpanel.PanelWindow : Gtk.Window { + + Services.BackgroundManager.initialize (this.monitor_number, panel_height); + +- Timeout.add (300 / panel_height, animation_step); ++ if (autohide == "Disabled" || autohide == "Dodge") { ++ hiding = false; ++ restrut = true; ++ timeout = Timeout.add (300 / panel_height, animation_step); ++ } else { ++ panel_displacement--; ++ animate_panel (); ++ } ++ } ++ ++ private bool hide_panel () { ++ if (autohide != "Disabled") { ++ hiding = true; ++ if (timeout > 0) { ++ Source.remove (timeout); ++ } ++ if (autohide == "Dodge") { ++ restrut = true; ++ timeout = Timeout.add (300 / panel_height, animation_step); ++ } else if (autohide == "Autohide") { ++ restrut = true; ++ timeout = Timeout.add (100 / panel_height, animation_step); ++ } else if (autohide == "Float") { ++ restrut = false; ++ timeout = Timeout.add (100 / panel_height, animation_step); ++ } ++ } ++ return true; ++ } ++ ++ private bool show_panel () { ++ if (autohide != "Disabled") { ++ hiding = false; ++ if (timeout > 0) { ++ Source.remove (timeout); ++ } ++ if (autohide == "Dodge") { ++ restrut = true; ++ timeout = Timeout.add (300 / panel_height, animation_step); ++ } else if (autohide == "Autohide") { ++ restrut = true; ++ timeout = Timeout.add (100 / panel_height, animation_step); ++ } else if (autohide == "Float") { ++ restrut = false; ++ timeout = Timeout.add (100 / panel_height, animation_step); ++ } ++ } ++ return true; ++ } ++ ++ private void update_autohide_mode () { ++ restrut = true; ++ if (autohide == "Disabled" || autohide == "Dodge") { ++ hiding = false; ++ timeout = Timeout.add (300 / panel_height, animation_step); ++ } else { ++ hiding = true; ++ timeout = Timeout.add (100 / panel_height, animation_step); ++ } + } + + private void update_panel_dimensions () { +@@ -114,6 +196,24 @@ public class Wingpanel.PanelWindow : Gtk.Window { + update_struts (); + } + ++ private void animate_panel () { ++ panel_height = panel.get_allocated_height (); ++ ++ monitor_number = screen.get_primary_monitor (); ++ Gdk.Rectangle monitor_dimensions; ++ this.screen.get_monitor_geometry (monitor_number, out monitor_dimensions); ++ ++ monitor_width = monitor_dimensions.width; ++ monitor_height = monitor_dimensions.height; ++ ++ this.set_size_request (monitor_width, (popover_manager.current_indicator != null ? monitor_height : -1)); ++ ++ monitor_x = monitor_dimensions.x; ++ monitor_y = monitor_dimensions.y; ++ ++ this.move (monitor_x, monitor_y - (panel_height + panel_displacement)); ++ } ++ + private void update_visual () { + var visual = this.screen.get_rgba_visual (); + +diff --git a/wingpanel/src/Services/Settings.vala b/wingpanel-qq/src/Services/Settings.vala +index 3bcd0a7..eeecbb8 100644 +--- a/wingpanel/src/Services/Settings.vala ++++ b/wingpanel-qq/src/Services/Settings.vala +@@ -23,6 +23,8 @@ namespace Wingpanel.Services { + + public bool use_transparency { get; set; } + ++ public string autohide { get; set; } ++ + public PanelSettings () { + base ("org.pantheon.desktop.wingpanel"); + } diff --git a/wingpanel-standalone-git/minus-backgroundmanager.patch b/wingpanel-standalone-git/minus-backgroundmanager.patch index 9efc0fd..764b603 100644 --- a/wingpanel-standalone-git/minus-backgroundmanager.patch +++ b/wingpanel-standalone-git/minus-backgroundmanager.patch @@ -1,58 +1,102 @@ --- src/wingpanel/src/PanelWindow.vala 2016-10-21 23:51:49.434036000 +0900 +++ src/wingpanel/src/PanelWindow.vala.new 2016-10-22 00:21:00.991151961 +0900 -@@ -86,7 +86,7 @@ +@@ -86,7 +86,6 @@ private void on_realize () { update_panel_dimensions (); - Services.BackgroundManager.initialize (this.monitor_number, panel_height); -+ //Services.BackgroundManager.initialize (this.monitor_number, panel_height); timeout = Timeout.add (100 / panel_height, animation_step); } -@@ -152,7 +152,7 @@ +@@ -152,7 +152,6 @@ public void set_expanded (bool expanded) { if (expand && !this.expanded) { - Services.BackgroundManager.get_default ().remember_window (); -+ //Services.BackgroundManager.get_default ().remember_window (); this.expanded = true; -@@ -163,7 +163,7 @@ +@@ -163,7 +163,6 @@ this.set_size_request (monitor_width, monitor_height); } else if (!expand) { - Services.BackgroundManager.get_default ().restore_window (); -+ //Services.BackgroundManager.get_default ().restore_window (); this.expanded = false; --- src/wingpanel/src/Widgets/Panel.vala 2016-10-22 00:14:45.485792472 +0900 +++ src/wingpanel/src/Widgets/Panel.vala.new 2016-10-22 00:15:13.386112571 +0900 -@@ -60,7 +60,7 @@ +@@ -25,7 +25,6 @@ + private MenuBar center_menubar; + + private Gtk.StyleContext style_context; +- private Gtk.CssProvider? style_provider = null; + + public Panel (Services.PopoverManager popover_manager) { + Object (popover_manager : popover_manager, orientation: Gtk.Orientation.HORIZONTAL); +@@ -60,7 +60,6 @@ style_context = this.get_style_context (); - Services.BackgroundManager.get_default ().background_state_changed.connect (update_background); -+ //Services.BackgroundManager.get_default ().background_state_changed.connect (update_background); } private void add_indicator (Indicator indicator) { -@@ -102,7 +102,7 @@ +@@ -228,55 +227,4 @@ } } - private void update_background (Services.BackgroundState state, uint animation_duration) { -+ /* private void update_background (Services.BackgroundState state, uint animation_duration) { - if (style_provider == null) { - style_provider = new Gtk.CssProvider (); - style_context.add_provider (style_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); -@@ -146,5 +146,5 @@ - style_context.remove_class ("maximized"); - break; - } +- if (style_provider == null) { +- style_provider = new Gtk.CssProvider (); +- style_context.add_provider (style_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); +- } +- +- string css = """ +- .panel { +- transition: all %ums ease-in-out; +- } +- """.printf (animation_duration); +- +- try { +- style_provider.load_from_data (css, css.length); +- } catch (Error e) { +- warning ("Parsing own style configuration failed: %s", e.message); +- } +- +- switch (state) { +- case Services.BackgroundState.DARK : +- style_context.add_class ("color-light"); +- style_context.remove_class ("color-dark"); +- style_context.remove_class ("maximized"); +- style_context.remove_class ("translucent"); +- break; +- case Services.BackgroundState.LIGHT: +- style_context.add_class ("color-dark"); +- style_context.remove_class ("color-light"); +- style_context.remove_class ("maximized"); +- style_context.remove_class ("translucent"); +- break; +- case Services.BackgroundState.MAXIMIZED: +- style_context.add_class ("maximized"); +- style_context.remove_class ("color-light"); +- style_context.remove_class ("color-dark"); +- style_context.remove_class ("translucent"); +- break; +- case Services.BackgroundState.TRANSLUCENT_DARK: +- style_context.add_class ("translucent"); +- style_context.add_class ("color-light"); +- style_context.remove_class ("color-dark"); +- style_context.remove_class ("maximized"); +- break; +- case Services.BackgroundState.TRANSLUCENT_LIGHT: +- style_context.add_class ("translucent"); +- style_context.add_class ("color-dark"); +- style_context.remove_class ("color-light"); +- style_context.remove_class ("maximized"); +- break; +- } - } -+ } */ } --- src/wingpanel/src/CMakeLists.txt 2017-10-13 03:28:23.119421691 +0900 +++ src/wingpanel/src/CMakeLists.txt.new 2017-10-13 03:30:12.838158479 +0900 diff --git a/wingpanel-standalone-git/minus-galaplugin.patch b/wingpanel-standalone-git/minus-galaplugin.patch index 561ec31..9880b96 100644 --- a/wingpanel-standalone-git/minus-galaplugin.patch +++ b/wingpanel-standalone-git/minus-galaplugin.patch @@ -652,9 +652,20 @@ - } - -} ---- src/wingpanel/wingpanel-interface/CMakeLists.txt 2018-03-04 00:44:38.725395035 +0900 -+++ /dev/null 2018-03-03 20:05:09.041298375 +0900 -@@ -1,80 +0,0 @@ +--- src/wingpanel/CMakeLists.txt 2017-10-13 03:25:28.007664080 +0900 ++++ src/wingpanel/CMakeLists.txt.new 2017-10-13 03:27:00.135900068 +0900 +@@ -121,8 +121,6 @@ + set (DEPS_LIBRARIES ${DEPS_LIBRARIES} ${LIB_NAME}) + add_subdirectory (src) + +-add_subdirectory (wingpanel-interface) +- + if (BUILD_SAMPLE) + add_subdirectory (sample) + endif () +--- src/wingpanel/wingpanel-interface/CMakeLists.txt 2018-03-05 15:53:08.967254520 +0900 ++++ /dev/null 2018-03-05 14:42:26.994151215 +0900 +@@ -1,90 +0,0 @@ -find_package (PkgConfig) - -pkg_check_modules (PLUGIN REQUIRED gala granite) @@ -672,6 +683,7 @@ -pkg_check_modules(MUTTER322 QUIET libmutter>=3.21) -pkg_check_modules(MUTTER324 QUIET libmutter-0>=3.23.90) -pkg_check_modules(MUTTER326 QUIET libmutter-1>=3.25.90) +-pkg_check_modules(MUTTER328 QUIET libmutter-2>=3.27.91) - -set (EXTRA_VALA_FLAGS "") -set (EXTRA_MUTTER_PKS cogl-1.0 clutter-1.0 libmutter) @@ -698,6 +710,12 @@ - set (EXTRA_MUTTER_PACKAGES mutter-cogl-1 mutter-clutter-1) -endif () - +-if (MUTTER328_FOUND) +- set (EXTRA_VALA_FLAGS ${EXTRA_VALA_FLAGS} --define HAS_MUTTER320 --define HAS_MUTTER322 --define HAS_MUTTER324 --define HAS_MUTTER326 --define HAS_MUTTER328) +- set (EXTRA_MUTTER_PKS mutter-cogl-2 mutter-cogl-pango-2 mutter-cogl-path-2 mutter-clutter-2 libmutter-2) +- set (EXTRA_MUTTER_PACKAGES mutter-cogl-2 mutter-clutter-2) +-endif () +- -pkg_check_modules (PLUGIN_MUTTER REQUIRED ${EXTRA_MUTTER_PKS}) - -include (ValaPrecompile) @@ -723,7 +741,10 @@ -target_link_libraries(${WINGPANELINTERFACE} ${PLUGIN_LIBRARIES} ${PLUGIN_MUTTER_LIBRARIES} m) - -# Add -rpath ldflag if libgala is using mutter >= 3.21 to pick up libmutter-*.so --if (MUTTER326_FOUND) +-if (MUTTER328_FOUND) +- _pkgconfig_invoke("libmutter-2" MUTTER TYPELIB_DIR "" "--variable=typelibdir") +- set_target_properties(${WINGPANELINTERFACE} PROPERTIES LINK_FLAGS -Wl,-rpath,${MUTTER_TYPELIB_DIR}) +-elseif (MUTTER326_FOUND) - _pkgconfig_invoke("libmutter-1" MUTTER TYPELIB_DIR "" "--variable=typelibdir") - set_target_properties(${WINGPANELINTERFACE} PROPERTIES LINK_FLAGS -Wl,-rpath,${MUTTER_TYPELIB_DIR}) -elseif (MUTTER324_FOUND) @@ -735,14 +756,3 @@ -endif () - -install (TARGETS ${WINGPANELINTERFACE} DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/gala/plugins) ---- src/wingpanel/CMakeLists.txt 2017-10-13 03:25:28.007664080 +0900 -+++ src/wingpanel/CMakeLists.txt.new 2017-10-13 03:27:00.135900068 +0900 -@@ -121,8 +121,6 @@ - set (DEPS_LIBRARIES ${DEPS_LIBRARIES} ${LIB_NAME}) - add_subdirectory (src) - --add_subdirectory (wingpanel-interface) -- - if (BUILD_SAMPLE) - add_subdirectory (sample) - endif ()