Compare commits
3 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1669fe3729 |
||
|
|
90b05cc1d0 |
||
|
|
5e5af02189 |
4 changed files with 70 additions and 8 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
|
@ -8,3 +8,6 @@
|
|||
/wingpanel-applications-menu-2.4.3.tar.gz
|
||||
/wingpanel-applications-menu-2.4.4.tar.gz
|
||||
/wingpanel-applications-menu-2.5.0.tar.gz
|
||||
/wingpanel-applications-menu-2.6.0.tar.gz
|
||||
/applications-menu-2.7.0.tar.gz
|
||||
/applications-menu-2.7.1.tar.gz
|
||||
|
|
|
|||
44
00-drop-broken-meson-deps.patch
Normal file
44
00-drop-broken-meson-deps.patch
Normal file
|
|
@ -0,0 +1,44 @@
|
|||
diff --git a/meson.build b/meson.build
|
||||
index 927731f..6089994 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -43,20 +43,12 @@ libsoup_dep = dependency('libsoup-2.4')
|
||||
appstream_dep = dependency('appstream')
|
||||
gio_unix_dep = dependency('gio-unix-2.0')
|
||||
json_glib_dep = dependency('json-glib-1.0')
|
||||
-zeitgeist_dep = dependency('zeitgeist-2.0')
|
||||
switchboard_dep = dependency('switchboard-2.0')
|
||||
libgnome_menu_dep = dependency('libgnome-menu-3.0')
|
||||
libhandy_dep = dependency('libhandy-0.0')
|
||||
wingpanel_dep = dependency('wingpanel-2.0', version: '>=2.1.0')
|
||||
posix_dep = meson.get_compiler('vala').find_library('posix')
|
||||
|
||||
-unity_dep = []
|
||||
-
|
||||
-if get_option('with-unity')
|
||||
- unity_dep = dependency('unity', version: '>=4.0.0')
|
||||
- add_project_arguments('--define=HAVE_UNITY', language: 'vala')
|
||||
-endif
|
||||
-
|
||||
plank_dep = dependency('plank', required: false)
|
||||
if plank_dep.version().version_compare('>=0.10.9')
|
||||
add_project_arguments('--define=HAS_PLANK', language: 'vala')
|
||||
diff --git a/meson_options.txt b/meson_options.txt
|
||||
index f970ad3..9e825c1 100644
|
||||
--- a/meson_options.txt
|
||||
+++ b/meson_options.txt
|
||||
@@ -1,2 +1 @@
|
||||
-option('with-unity', type : 'boolean', value : 'true', description : 'Add Unity launcher support')
|
||||
option('with-zeitgeist', type : 'boolean', value : 'true', description : 'Add Zeitgeist support')
|
||||
diff --git a/src/meson.build b/src/meson.build
|
||||
index 30e194b..09cfd10 100644
|
||||
--- a/src/meson.build
|
||||
+++ b/src/meson.build
|
||||
@@ -78,7 +78,6 @@ dependencies = [
|
||||
libsoup_dep,
|
||||
appstream_dep,
|
||||
plank_dep,
|
||||
- unity_dep,
|
||||
wingpanel_dep,
|
||||
libhandy_dep,
|
||||
posix_dep,
|
||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (wingpanel-applications-menu-2.5.0.tar.gz) = 040fb9402b72f01261ab495ef33f03c55c55344c88d7ff4ae4a8f9ace942c7a64e435632d9cb9db1035d5394dc364d857a2b4e7ddd59edc0ef74b8c67a7865dd
|
||||
SHA512 (applications-menu-2.7.1.tar.gz) = 3ba9b7d6491d0cb50edaa72ea04900deba71c6e1706ff0b81278e4b1462581e6ad379a59e7e0283aab19b71c3587ab872f241aae0505f2b4a857cf6da95a3bdb
|
||||
|
|
|
|||
|
|
@ -1,16 +1,21 @@
|
|||
%global __provides_exclude_from ^%{_libdir}/wingpanel/.*\\.so$
|
||||
|
||||
%global srcname applications-menu
|
||||
%global appname io.elementary.wingpanel.applications-menu
|
||||
|
||||
%global __provides_exclude_from ^%{_libdir}/(wingpanel|%{appname})/.*\\.so$
|
||||
|
||||
Name: wingpanel-applications-menu
|
||||
Summary: Lightweight and stylish app launcher
|
||||
Version: 2.5.0
|
||||
Version: 2.7.1
|
||||
Release: 1%{?dist}
|
||||
License: GPLv3+
|
||||
|
||||
URL: https://github.com/elementary/%{srcname}
|
||||
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
|
||||
Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
|
||||
|
||||
# - drop unity dependency from meson entirely
|
||||
# - allow disabling "optional" zeitgeist dependency
|
||||
# https://github.com/elementary/applications-menu/pull/392
|
||||
Patch0: 00-drop-broken-meson-deps.patch
|
||||
|
||||
BuildRequires: gettext
|
||||
BuildRequires: libappstream-glib
|
||||
|
|
@ -26,12 +31,11 @@ BuildRequires: pkgconfig(granite) >= 0.5
|
|||
BuildRequires: pkgconfig(gtk+-3.0) >= 3.12.0
|
||||
BuildRequires: pkgconfig(json-glib-1.0)
|
||||
BuildRequires: pkgconfig(libgnome-menu-3.0)
|
||||
BuildRequires: pkgconfig(libhandy-0.0)
|
||||
BuildRequires: pkgconfig(libsoup-2.4)
|
||||
BuildRequires: pkgconfig(plank) >= 0.10.9
|
||||
BuildRequires: pkgconfig(switchboard-2.0)
|
||||
BuildRequires: pkgconfig(unity) >= 4.0.0
|
||||
BuildRequires: pkgconfig(wingpanel-2.0) >= 2.1.0
|
||||
BuildRequires: pkgconfig(zeitgeist-2.0)
|
||||
|
||||
Requires: redhat-menus
|
||||
|
||||
|
|
@ -51,7 +55,7 @@ The lightweight and stylish app launcher from elementary.
|
|||
|
||||
|
||||
%build
|
||||
%meson
|
||||
%meson -Dwith-zeitgeist=false
|
||||
%meson_build
|
||||
|
||||
|
||||
|
|
@ -72,6 +76,7 @@ appstream-util validate-relax --nonet \
|
|||
|
||||
%config(noreplace) %{_sysconfdir}/xdg/menus/pantheon-applications.menu
|
||||
|
||||
%{_libdir}/%{appname}/
|
||||
%{_libdir}/wingpanel/libslingshot.so
|
||||
|
||||
%{_datadir}/glib-2.0/schemas/io.elementary.desktop.wingpanel.applications-menu.gschema.xml
|
||||
|
|
@ -79,6 +84,16 @@ appstream-util validate-relax --nonet \
|
|||
|
||||
|
||||
%changelog
|
||||
* Thu May 28 2020 Fabio Valentini <decathorpe@gmail.com> - 2.7.1-1
|
||||
- Update to version 2.7.1.
|
||||
- Drop useless unity and zeitgeist dependencies.
|
||||
|
||||
* Sat May 09 2020 Fabio Valentini <decathorpe@gmail.com> - 2.7.0-1
|
||||
- Update to version 2.7.0.
|
||||
|
||||
* Sat Apr 18 2020 Fabio Valentini <decathorpe@gmail.com> - 2.6.0-1
|
||||
- Update to version 2.6.0.
|
||||
|
||||
* Mon Nov 25 2019 Fabio Valentini <decathorpe@gmail.com> - 2.5.0-1
|
||||
- Update to version 2.5.0.
|
||||
- Switch to meson build system.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue