diff options
| author | Que Quotion | 2018-03-07 00:41:54 +0900 |
|---|---|---|
| committer | Que Quotion | 2018-03-07 00:44:28 +0900 |
| commit | b2accc1004a12ce167dfbca0ce01887cbdc9143b (patch) | |
| tree | bccf4f5c26d162aa9b4775be312d0f8a92ad588b /minus-galaplugin.patch | |
| parent | ecdf2fc8c144eaa7642539831bb2e96e9d7e57fe (diff) | |
| download | aur-b2accc1004a12ce167dfbca0ce01887cbdc9143b.tar.gz | |
Autohide: See https://github.com/elementary/wingpanel/pull/93
Diffstat (limited to 'minus-galaplugin.patch')
| -rw-r--r-- | minus-galaplugin.patch | 40 |
1 files changed, 25 insertions, 15 deletions
diff --git a/minus-galaplugin.patch b/minus-galaplugin.patch index 561ec31c8bb0..9880b96da088 100644 --- a/minus-galaplugin.patch +++ b/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 () |