wok-next rev 20939
Fix brisk-menu, mate-backgrounds, mate-user-guide
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Sun Aug 26 09:13:55 2018 +0300 (2018-08-26) |
parents | 9102678083fb |
children | 5730b2738428 |
files | brisk-menu/receipt brisk-menu/stuff/patches/fix73.patch brisk-menu/stuff/patches/series mate-backgrounds/receipt mate-user-guide/receipt |
line diff
1.1 --- a/brisk-menu/receipt Sun Aug 26 05:08:11 2018 +0300 1.2 +++ b/brisk-menu/receipt Sun Aug 26 09:13:55 2018 +0300 1.3 @@ -8,18 +8,18 @@ 1.4 LICENSE="GPL2" 1.5 WEB_SITE="https://github.com/solus-project/brisk-menu" 1.6 1.7 -TARBALL="$PACKAGE-$VERSION.tar.xz" 1.8 +TARBALL="$PACKAGE-v$VERSION.tar.xz" 1.9 WGET_URL="https://github.com/solus-project/brisk-menu/releases/download/v$VERSION/$TARBALL" 1.10 1.11 -BUILD_DEPENDS="intltool automake libtool gtk+3-dev mate-menus-dev \ 1.12 -mate-panel-dev" 1.13 +BUILD_DEPENDS="meson ninja gtk+3-dev mate-panel-dev mate-menus-dev \ 1.14 +libnotify-dev gettext" 1.15 1.16 compile_rules() { 1.17 - ./autogen.sh \ 1.18 - $CONFIGURE_ARGS && 1.19 - fix libtool && 1.20 - make && 1.21 - make install 1.22 + mkdir build 1.23 + cd build 1.24 + meson-wrapper && 1.25 + ninja && 1.26 + ninja install 1.27 } 1.28 1.29 genpkg_rules() {
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/brisk-menu/stuff/patches/fix73.patch Sun Aug 26 09:13:55 2018 +0300 2.3 @@ -0,0 +1,186 @@ 2.4 +https://github.com/sunweaver/brisk-menu/commit/3cab9d1fc7b2ca500c7d3276e17b256f395e0126 2.5 + 2.6 +--- brisk-menu-0.5.0.orig/data/meson.build 2.7 ++++ brisk-menu-0.5.0/data/meson.build 2.8 +@@ -12,6 +12,22 @@ 2.9 + ], 2.10 + ) 2.11 + 2.12 ++# libsaver_glue provides dbus code for the MATE screensaver 2.13 ++libsaver_glue = gnome.gdbus_codegen( 2.14 ++ 'libsaver-glue', 2.15 ++ 'org.mate.ScreenSaver.xml', 2.16 ++ interface_prefix : 'org.mate.', 2.17 ++ namespace : 'Mate', 2.18 ++) 2.19 ++ 2.20 ++# libsession_glue provides dbus code for the MATE/GNOME session 2.21 ++libsession_glue = gnome.gdbus_codegen( 2.22 ++ 'libsession-glue', 2.23 ++ 'org.gnome.SessionManager.xml', 2.24 ++ interface_prefix : 'org.gnome.', 2.25 ++ namespace : 'Gnome', 2.26 ++) 2.27 ++ 2.28 + icons = [ 2.29 + 'brisk_system-log-out-symbolic.svg', 2.30 + ] 2.31 +--- /dev/null 2.32 ++++ brisk-menu-0.5.0/data/org.gnome.SessionManager.xml 2.33 +@@ -0,0 +1,15 @@ 2.34 ++<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" 2.35 ++ "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd"> 2.36 ++<!-- GDBus 2.48.1 --> 2.37 ++<node> 2.38 ++ <interface name="org.gnome.SessionManager"> 2.39 ++ <method name="Shutdown"/> 2.40 ++ <method name="Reboot"/> 2.41 ++ <method name="CanShutdown"> 2.42 ++ <arg type="b" name="is_available" direction="out"/> 2.43 ++ </method> 2.44 ++ <method name="Logout"> 2.45 ++ <arg type="u" name="mode" direction="in"/> 2.46 ++ </method> 2.47 ++ </interface> 2.48 ++</node> 2.49 +--- /dev/null 2.50 ++++ brisk-menu-0.5.0/data/org.mate.ScreenSaver.xml 2.51 +@@ -0,0 +1,11 @@ 2.52 ++<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" 2.53 ++"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd"> 2.54 ++<node> 2.55 ++ <interface name="org.mate.ScreenSaver"> 2.56 ++ <method name="Lock"> 2.57 ++ </method> 2.58 ++ <method name="GetActive"> 2.59 ++ <arg name="value" direction="out" type="b"/> 2.60 ++ </method> 2.61 ++ </interface> 2.62 ++</node> 2.63 +--- brisk-menu-0.5.0.orig/src/frontend/meson.build 2.64 ++++ brisk-menu-0.5.0/src/frontend/meson.build 2.65 +@@ -24,6 +24,7 @@ 2.66 + 2.67 + libfrontend_includes = [ 2.68 + include_directories('.'), 2.69 ++ include_directories('../../data'), 2.70 + ] 2.71 + 2.72 + # Contains the main Brisk UI (Windowed) 2.73 +--- brisk-menu-0.5.0.orig/src/meson.build 2.74 ++++ brisk-menu-0.5.0/src/meson.build 2.75 +@@ -18,14 +18,36 @@ 2.76 + ], 2.77 + ) 2.78 + 2.79 ++# Build the Cs into a simple static library and control compiler noise 2.80 ++libsession_stub = static_library( 2.81 ++ 'brisk-glue', 2.82 ++ sources: [ 2.83 ++ libsaver_glue, 2.84 ++ libsession_glue, 2.85 ++ ], 2.86 ++ c_args: [ 2.87 ++ '-Wno-unused-parameter', 2.88 ++ ], 2.89 ++ dependencies: dep_gio_unix, 2.90 ++ install: false, 2.91 ++) 2.92 ++ 2.93 ++# Allow linking to the stub 2.94 ++link_libsession_stub = declare_dependency( 2.95 ++ link_with: libsession_stub, 2.96 ++ dependencies: [ 2.97 ++ dep_gio_unix, 2.98 ++ ], 2.99 ++ include_directories: [ 2.100 ++ include_directories('.'), 2.101 ++ ], 2.102 ++) 2.103 ++ 2.104 + # Build common library (currently just keybinder really.) 2.105 + subdir('lib') 2.106 + 2.107 + # Build the backend component 2.108 + subdir('backend') 2.109 +- 2.110 +-# Build session glue to help the frontend out 2.111 +-subdir('session') 2.112 + 2.113 + # Now build our main UI 2.114 + subdir('frontend') 2.115 +--- brisk-menu-0.5.0.orig/src/session/meson.build 2.116 ++++ /dev/null 2.117 +@@ -1,40 +0,0 @@ 2.118 +-# libsaver_glue provides dbus code for the MATE screensaver 2.119 +-libsaver_glue = gnome.gdbus_codegen( 2.120 +- 'libsaver-glue', 2.121 +- 'org.mate.ScreenSaver.xml', 2.122 +- interface_prefix : 'org.mate.', 2.123 +- namespace : 'Mate', 2.124 +-) 2.125 +- 2.126 +-# libsession_glue provides dbus code for the MATE/GNOME session 2.127 +-libsession_glue = gnome.gdbus_codegen( 2.128 +- 'libsession-glue', 2.129 +- 'org.gnome.SessionManager.xml', 2.130 +- interface_prefix : 'org.gnome.', 2.131 +- namespace : 'Gnome', 2.132 +-) 2.133 +- 2.134 +-# Build the Cs into a simple static library and control compiler noise 2.135 +-libsession_stub = static_library( 2.136 +- 'brisk-glue', 2.137 +- sources: [ 2.138 +- libsaver_glue, 2.139 +- libsession_glue, 2.140 +- ], 2.141 +- c_args: [ 2.142 +- '-Wno-unused-parameter', 2.143 +- ], 2.144 +- dependencies: dep_gio_unix, 2.145 +- install: false, 2.146 +-) 2.147 +- 2.148 +-# Allow linking to the stub 2.149 +-link_libsession_stub = declare_dependency( 2.150 +- link_with: libsession_stub, 2.151 +- dependencies: [ 2.152 +- dep_gio_unix, 2.153 +- ], 2.154 +- include_directories: [ 2.155 +- include_directories('.'), 2.156 +- ], 2.157 +-) 2.158 +--- brisk-menu-0.5.0.orig/src/session/org.gnome.SessionManager.xml 2.159 ++++ /dev/null 2.160 +@@ -1,15 +0,0 @@ 2.161 +-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" 2.162 +- "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd"> 2.163 +-<!-- GDBus 2.48.1 --> 2.164 +-<node> 2.165 +- <interface name="org.gnome.SessionManager"> 2.166 +- <method name="Shutdown"/> 2.167 +- <method name="Reboot"/> 2.168 +- <method name="CanShutdown"> 2.169 +- <arg type="b" name="is_available" direction="out"/> 2.170 +- </method> 2.171 +- <method name="Logout"> 2.172 +- <arg type="u" name="mode" direction="in"/> 2.173 +- </method> 2.174 +- </interface> 2.175 +-</node> 2.176 +--- brisk-menu-0.5.0.orig/src/session/org.mate.ScreenSaver.xml 2.177 ++++ /dev/null 2.178 +@@ -1,11 +0,0 @@ 2.179 +-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" 2.180 +-"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd"> 2.181 +-<node> 2.182 +- <interface name="org.mate.ScreenSaver"> 2.183 +- <method name="Lock"> 2.184 +- </method> 2.185 +- <method name="GetActive"> 2.186 +- <arg name="value" direction="out" type="b"/> 2.187 +- </method> 2.188 +- </interface> 2.189 +-</node>
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/brisk-menu/stuff/patches/series Sun Aug 26 09:13:55 2018 +0300 3.3 @@ -0,0 +1,1 @@ 3.4 +fix73.patch
4.1 --- a/mate-backgrounds/receipt Sun Aug 26 05:08:11 2018 +0300 4.2 +++ b/mate-backgrounds/receipt Sun Aug 26 09:13:55 2018 +0300 4.3 @@ -11,7 +11,7 @@ 4.4 TARBALL="$PACKAGE-$VERSION.tar.gz" 4.5 WGET_URL="https://github.com/mate-desktop/mate-backgrounds/archive/v$VERSION.tar.gz" 4.6 4.7 -BUILD_DEPENDS="mate-common" 4.8 +BUILD_DEPENDS="mate-common glib-dev" 4.9 SPLIT="mate-backgrounds-abstract mate-backgrounds-desktop \ 4.10 mate-backgrounds-nature" 4.11
5.1 --- a/mate-user-guide/receipt Sun Aug 26 05:08:11 2018 +0300 5.2 +++ b/mate-user-guide/receipt Sun Aug 26 09:13:55 2018 +0300 5.3 @@ -8,13 +8,13 @@ 5.4 LICENSE="FDL1.1" 5.5 WEB_SITE="https://github.com/mate-desktop/mate-user-guide" 5.6 5.7 -TARBALL="$PACKAGE-$VERSION.tar.gz" 5.8 -WGET_URL="https://github.com/mate-desktop/mate-user-guide/archive/v$VERSION.tar.gz" 5.9 +TARBALL="$PACKAGE-$VERSION.tar.xz" 5.10 +WGET_URL="http://pub.mate-desktop.org/releases/${VERSION%.*}/$TARBALL" 5.11 5.12 -BUILD_DEPENDS="mate-common yelp-tools itstool" 5.13 +BUILD_DEPENDS="mate-common yelp-tools itstool glib-dev libxml2-tools" 5.14 5.15 compile_rules() { 5.16 - ./autogen.sh \ 5.17 + ./configure \ 5.18 $CONFIGURE_ARGS && 5.19 make && 5.20 make install