SHA256
1
0
forked from pool/ayatana-ido

- Update to version 0.9.0.

OBS-URL: https://build.opensuse.org/package/show/X11:Unity/ayatana-ido?expand=0&rev=14
This commit is contained in:
Alexei Sorokin 2021-11-27 15:47:33 +00:00 committed by Git OBS Bridge
parent d15c9ea7a1
commit 3fef43c3f6
6 changed files with 73 additions and 36 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4d5cb5df9ab5b8e5fbe47caf077aa001d167bad5ee80df825b910d83904ac777
size 125003

View File

@ -0,0 +1,22 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,6 +32,7 @@ endif()
set(DEPS glib-2.0>=2.58 gtk+-3.0>=3.24)
find_package (PkgConfig REQUIRED)
+find_library(M_LIBRARY m)
pkg_check_modules(PROJECT_DEPS REQUIRED ${DEPS})
# Set global variables
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -99,6 +99,9 @@ set_source_files_properties(${SOURCES} P
add_library("ayatana-ido3-0.4" SHARED ${SOURCES})
set_target_properties("ayatana-ido3-0.4" PROPERTIES VERSION 0.0.0 SOVERSION 0)
target_link_libraries("ayatana-ido3-0.4" ${PROJECT_DEPS_LIBRARIES})
+if(M_LIBRARY)
+ target_link_libraries("ayatana-ido3-0.4" ${M_LIBRARY})
+endif()
target_include_directories("ayatana-ido3-0.4" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS})
target_include_directories("ayatana-ido3-0.4" PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
target_include_directories("ayatana-ido3-0.4" PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})

3
ayatana-ido-0.9.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e09b182a67ea65e188a689a2ff792c9a3830740f1aec6679bbd6021235402b4b
size 121065

View File

@ -1,3 +1,25 @@
-------------------------------------------------------------------
Wed Nov 24 20:55:20 UTC 2021 - Alexei Sorokin <sor.alexei@meowr.ru>
- Update to version 0.9.0:
* Switch to CMake from autotools.
* Add better documentation.
* data/libayatana-ido3-0.4.pc.in: Add glib-2.0 dependency.
* src/idoappointmentmenuitem.c: Construct the basic menu item
using the pixbuf property.
* src/basicmenuitem.c: Add GdkPixbuf source support for the
icon.
* src/idoremovablemenuitem.c: Replace grid with box to fix
a11y.
* src/idolocationmenuitem.c: Fix deprecated g_time_zone_new
warning.
* Fix a unit test failure on Ubuntu 20.04.
* Use consistent Ayatana IDO names. This version of Ayatana IDO
breaks NG system indicators before 0.9.x.
- Drop pkgconfig-requires.patch: merged upstream.
- Add ayatana-ido-0.9.0-libm.patch: Link with libm to fix build.
- Restore Group.
-------------------------------------------------------------------
Thu Jun 3 16:48:43 UTC 2021 - Ferdinand Thiessen <rpm@fthiessen.de>

View File

@ -16,27 +16,27 @@
#
%define lname libayatana-ido3-0_4
%define lname libayatana-ido3-0_4-0
%define soname libayatana-ido3-0.4
%define sover 0
%define typelib typelib-1_0-AyatanaIdo3-0_4
Name: ayatana-ido
Version: 0.8.2
Version: 0.9.0
Release: 0
Summary: Ayatana Indicator Display Objects
License: GPL-3.0-only AND LGPL-3.0-only AND LGPL-2.1-only
Group: System/GUI/Other
URL: https://github.com/AyatanaIndicators/ayatana-ido
Source: %{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
Source: https://github.com/AyatanaIndicators/ayatana-ido/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
Source1: baselibs.conf
# PATCH-FIX-UPSTREAM pkgconfig-requires.patch -- https://github.com/AyatanaIndicators/ayatana-ido/issues/37
Patch0: pkgconfig-requires.patch
# PATCH-FIX-UPSTREAM ayatana-ido-0.9.0-libm.patch -- Link with libm to fix build.
Patch0: ayatana-ido-0.9.0-libm.patch
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: gtk-doc
BuildRequires: mate-common
BuildRequires: pkgconfig
BuildRequires: vala >= 0.16
BuildRequires: pkgconfig(gio-2.0) >= 2.37.0
BuildRequires: pkgconfig(glib-2.0) >= 2.37.0
BuildRequires: pkgconfig(gio-2.0)
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(xorg-macros)
@ -44,20 +44,22 @@ BuildRequires: pkgconfig(xorg-macros)
%description
Widgets and other objects used for indicators.
%package -n %{lname}-%{sover}
Summary: Shared library providing extra GTK+ menu items in system indicators
%package -n %{lname}
Summary: Shared library providing extra GTK menu items in system indicators
Group: System/Libraries
%description -n %{lname}-%{sover}
Shared library providing extra GTK+ menu items for display in
%description -n %{lname}
Shared library providing extra GTK menu items for display in
system indicators.
This package contains shared libraries.
%package -n %{typelib}
Summary: Ayatana Indicator Display Objects typelib
Group: System/Libraries
%description -n %{typelib}
Shared library providing extra GTK+ menu items for display in
Shared library providing extra GTK menu items for display in
system indicators.
This package provides the GObject Introspection bindings for
@ -65,12 +67,13 @@ Ayatana Ido.
%package devel
Summary: Development files for Ayatana Indicator Display Objects
Requires: %{lname}-%{sover} = %{version}
Group: Development/Libraries/C and C++
Requires: %{lname} = %{version}
Requires: %{typelib} = %{version}
Requires: pkgconfig(gobject-introspection-1.0)
%description devel
Shared library providing extra GTK+ menu items for display in
Shared library providing extra GTK menu items for display in
system indicators.
This package contains the development files for Ido.
@ -79,18 +82,17 @@ This package contains the development files for Ido.
%autosetup -p1
%build
NOCONFIGURE=1 mate-autogen
%configure
%make_build
%cmake
%cmake_build
%install
%make_install
find %{buildroot} -type f -name "*.la" -delete -print
%cmake_install
%post -n %{lname}-%{sover} -p /sbin/ldconfig
%postun -n %{lname}-%{sover} -p /sbin/ldconfig
%post -n %{lname} -p /sbin/ldconfig
%files -n %{lname}-%{sover}
%postun -n %{lname} -p /sbin/ldconfig
%files -n %{lname}
%license COPYING*
%{_libdir}/%{soname}.so.%{sover}*

View File

@ -1,9 +0,0 @@
diff -Nur ayatana-ido-0.8.2/libayatana-ido3.pc.in new/libayatana-ido3.pc.in
--- ayatana-ido-0.8.2/libayatana-ido3.pc.in 2021-01-25 16:55:03.000000000 +0100
+++ new/libayatana-ido3.pc.in 2021-06-04 12:22:17.859969238 +0200
@@ -8,4 +8,4 @@
Version: @VERSION@
Libs: -L${libdir} -layatana-ido3-0.4
Cflags: -I${includedir}/libayatana-ido3-0.4
-Requires: gtk+-3.0
+Requires: gtk+-3.0 glib-2.0