diff options
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | PKGBUILD | 13 | ||||
| -rw-r--r-- | autohide.patch | 28 | ||||
| -rw-r--r-- | minus-backgroundmanager.patch | 10 | ||||
| -rw-r--r-- | minus-galaplugin.patch | 11 |
5 files changed, 9 insertions, 61 deletions
@@ -1,6 +1,6 @@ pkgbase = wingpanel-standalone-git pkgdesc = Stylish top panel that holds indicators and spawns an application launcher (without Gala dependencies) - pkgver = r380.b009131 + pkgver = r382.dd64ba8 pkgrel = 1 url = https://github.com/elementary/wingpanel arch = i686 @@ -47,11 +47,11 @@ pkgbase = wingpanel-standalone-git source = autohide.patch source = reverse-105c1d0.patch sha256sums = SKIP - sha256sums = 838dfc047b0deb1e1e63325f1aa78a67254ec80c0400b59d74cb619a06008ffd - sha256sums = d9ce223b7e7b34d6187f5bf78d0d41acf5fb4be4bcced49116f01c0d7ed10fc4 + sha256sums = 206e5e66501bd0aaefaa422edb4ef5b47dc5c1aff8a90410971b8be2147245e6 + sha256sums = aa0a27e41df60a7b15e2fd7e0d06551663b98917b7632e4067e6b9a39407de1c sha256sums = 04fc55095e9fabc61862ef9a54934402b940b6cfa90fe5ed67462aa78e6e8f8e sha256sums = b1902c1d44ac546df63cd0224a7d2ef2cb6394ca556512c30c370d387db7bbab - sha256sums = 40872d84e403aa8a62904b598df6b66b817215cd43c847bc26eacf988dc7c751 + sha256sums = 54d0fa9110eb948bc7a8ac55ed323b6979aabdf0657dcabfae2304b1dd16c194 sha256sums = 53bfa2220d14065ca848c36217abe812685c7d6e0d42251423d0faa2a0ac5394 pkgname = wingpanel-standalone-git @@ -2,7 +2,7 @@ # Contributor: Maxime Gauduin <alucryd@archlinux.org> pkgname=wingpanel-standalone-git -pkgver=r380.b009131 +pkgver=r382.dd64ba8 pkgrel=1 pkgdesc='Stylish top panel that holds indicators and spawns an application launcher (without Gala dependencies)' arch=('i686' 'x86_64') @@ -30,11 +30,11 @@ source=('git+https://github.com/elementary/wingpanel.git' 'autohide.patch' 'reverse-105c1d0.patch') sha256sums=('SKIP' - '838dfc047b0deb1e1e63325f1aa78a67254ec80c0400b59d74cb619a06008ffd' - 'd9ce223b7e7b34d6187f5bf78d0d41acf5fb4be4bcced49116f01c0d7ed10fc4' + '206e5e66501bd0aaefaa422edb4ef5b47dc5c1aff8a90410971b8be2147245e6' + 'aa0a27e41df60a7b15e2fd7e0d06551663b98917b7632e4067e6b9a39407de1c' '04fc55095e9fabc61862ef9a54934402b940b6cfa90fe5ed67462aa78e6e8f8e' 'b1902c1d44ac546df63cd0224a7d2ef2cb6394ca556512c30c370d387db7bbab' - '40872d84e403aa8a62904b598df6b66b817215cd43c847bc26eacf988dc7c751' + '54d0fa9110eb948bc7a8ac55ed323b6979aabdf0657dcabfae2304b1dd16c194' '53bfa2220d14065ca848c36217abe812685c7d6e0d42251423d0faa2a0ac5394') pkgver() { @@ -67,10 +67,7 @@ prepare() { msg2 "Remove CoglFixes (broken)" patch -Np2 < ../y-is-broken-cogl.patch - if [[ -d build ]]; then - rm -rf build - fi - mkdir build + [ ! -d build ] || rm -rf build } build() { diff --git a/autohide.patch b/autohide.patch index 57adbd6a47c8..6687596e2918 100644 --- a/autohide.patch +++ b/autohide.patch @@ -11,34 +11,6 @@ index 20a23ed..409aceb 100644 install: - docker pull elementary/docker:juno-unstable -diff --git a/./CMakeLists.txt b/../wingpanel-qq/wingpanel-qq/CMakeLists.txt -index 2309c8b..878fc26 100644 ---- a/./CMakeLists.txt -+++ b/../wingpanel-qq/wingpanel-qq/CMakeLists.txt -@@ -76,6 +76,7 @@ set (LIB_PACKAGES - gee-0.8 - gmodule-2.0 - gtk+-3.0 -+ libwnck-3.0 - ) - - set (LIB_PKG -@@ -84,11 +85,15 @@ set (LIB_PKG - gee-0.8 - gmodule-2.0 - gtk+-3.0>=3.22 -+ libwnck-3.0>=3.14 - ) - find_package(PkgConfig) - - pkg_check_modules (LIB REQUIRED ${LIB_PKG}) - -+add_definitions (-DWNCK_I_KNOW_THIS_IS_UNSTABLE ${WNCK_CFLAGS}) -+link_libraries (${WNCK_LIBRARIES}) -+ - set (GLOBAL_VALAC_OPTIONS - --vapidir=${CMAKE_BINARY_DIR}/lib - --vapidir=vapi diff --git a/./meson.build b/../wingpanel-qq/wingpanel-qq/meson.build index 4f0f279..19b4f65 100644 --- a/./meson.build diff --git a/minus-backgroundmanager.patch b/minus-backgroundmanager.patch index 9f0c21fc26c8..603b7ccf241c 100644 --- a/minus-backgroundmanager.patch +++ b/minus-backgroundmanager.patch @@ -135,16 +135,6 @@ - } - } } ---- src/wingpanel/src/CMakeLists.txt 2017-10-13 03:28:23.119421691 +0900 -+++ src/wingpanel/src/CMakeLists.txt 2017-10-13 03:30:12.838158479 +0900 -@@ -10,7 +10,6 @@ - Services/IndicatorSorter.vala - Services/PopoverManager.vala - Services/Settings.vala -- Services/BackgroundManager.vala - ) - - vala_precompile (CLIENT_VALA_C ${CMAKE_PROJECT_NAME} --- src/wingpanel/src/meson.build 2018-12-02 05:25:42.153643446 +0900 +++ src/wingpanel/src/meson.build.new 2018-12-02 05:27:27.293643581 +0900 @@ -1,7 +1,6 @@ diff --git a/minus-galaplugin.patch b/minus-galaplugin.patch index d7123a2b4e81..61e59acf2b5b 100644 --- a/minus-galaplugin.patch +++ b/minus-galaplugin.patch @@ -1,14 +1,3 @@ ---- src/wingpanel/CMakeLists.txt 2017-10-13 03:25:28.007664080 +0900 -+++ src/wingpanel/CMakeLists.txt 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/meson.build 2018-12-02 05:28:40.983643676 +0900 +++ src/wingpanel/meson.build.new 2018-12-02 05:29:34.203643745 +0900 @@ -38,7 +38,6 @@ |