[packages/ayatana-ido] up to 0.9.0
atler
atler at pld-linux.org
Thu Nov 4 14:32:08 CET 2021
commit fe921c98c5fcded45eded813c69d1b041797a395
Author: Jan Palus <atler at pld-linux.org>
Date: Thu Nov 4 14:30:19 2021 +0100
up to 0.9.0
- upstream migrated to cmake
- patch to prevent CMAKE_BUILD_TYPE override so our build flags are used
- add linking to libm (https://github.com/AyatanaIndicators/ayatana-ido/issues/52)
ayatana-ido.spec | 40 +++++++++++++++++-----------------------
build-type.patch | 23 +++++++++++++++++++++++
link-math.patch | 11 +++++++++++
3 files changed, 51 insertions(+), 23 deletions(-)
---
diff --git a/ayatana-ido.spec b/ayatana-ido.spec
index 958816c..3458e0c 100644
--- a/ayatana-ido.spec
+++ b/ayatana-ido.spec
@@ -1,27 +1,27 @@
Summary: Shared functions for Ayatana Indicator Display Objects
Summary(pl.UTF-8): Funkcje współdzielone dla obiektów wyświetlania wskaźników Ayatana
Name: ayatana-ido
-Version: 0.8.2
+Version: 0.9.0
Release: 1
License: LGPL v2.1 or LGPL v3
Group: Libraries
#Source0Download: https://github.com/AyatanaIndicators/ayatana-ido/releases
Source0: https://github.com/AyatanaIndicators/ayatana-ido/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: f72ce8fb7bdedf80c20d6083fa371e19
+# Source0-md5: 63e62f18952f874e9173285c621f62f4
+Patch0: build-type.patch
+Patch1: link-math.patch
URL: https://github.com/AyatanaIndicators/ayatana-ido
-BuildRequires: autoconf >= 2.64
-BuildRequires: automake >= 1:1.11
-BuildRequires: glib2-devel >= 1:2.37.0
+BuildRequires: cmake >= 3.13
+BuildRequires: glib2-devel >= 1:2.58
BuildRequires: gobject-introspection-devel >= 0.6.7
-BuildRequires: gtk+3-devel >= 3.8.2
+BuildRequires: gtk+3-devel >= 3.24
BuildRequires: gtk-doc >= 1.8
-BuildRequires: libtool >= 2:2.2
BuildRequires: pkgconfig
+BuildRequires: rpmbuild(macros) >= 1.605
BuildRequires: sed >= 4.0
BuildRequires: vala
-BuildRequires: which
-Requires: glib2 >= 1:2.37.0
-Requires: gtk+3 >= 3.8.2
+Requires: glib2 >= 1:2.58
+Requires: gtk+3 >= 3.24
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -35,8 +35,8 @@ Summary: Development files for ayatana-ido library
Summary(pl.UTF-8): Pliki programistyczne biblioteki ayatana-ido
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: glib2-devel >= 1:2.37.0
-Requires: gtk+3-devel >= 3.8.2
+Requires: glib2-devel >= 1:2.58
+Requires: gtk+3-devel >= 3.24
%description devel
This package contains the header files for developing applications
@@ -62,25 +62,19 @@ API języka Vala do biblioteki ayatana-ido.
%prep
%setup -q
+%patch0 -p1
+%patch1 -p1
%build
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
- --disable-silent-rules
-%{__make}
+%cmake -B build
+%{__make} -C build
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} install \
+%{__make} -C build install \
DESTDIR=$RPM_BUILD_ROOT
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib*.la
-
%clean
rm -rf $RPM_BUILD_ROOT
diff --git a/build-type.patch b/build-type.patch
new file mode 100644
index 0000000..6e18ceb
--- /dev/null
+++ b/build-type.patch
@@ -0,0 +1,23 @@
+--- ayatana-ido-0.9.0/CMakeLists.txt.orig 2021-11-02 16:52:12.000000000 +0100
++++ ayatana-ido-0.9.0/CMakeLists.txt 2021-11-04 14:12:52.765226502 +0100
+@@ -13,20 +13,6 @@
+ option(ENABLE_COVERAGE "Enable coverage reports (includes enabling all tests and checks)" OFF)
+ option(ENABLE_WERROR "Treat all build warnings as errors" OFF)
+
+-if(ENABLE_COVERAGE)
+- set(ENABLE_TESTS ON)
+- set(CMAKE_BUILD_TYPE "Coverage")
+-else()
+- set(CMAKE_BUILD_TYPE "Release")
+-endif()
+-
+-if(ENABLE_COVERAGE)
+- set(ENABLE_TESTS ON)
+- set(CMAKE_BUILD_TYPE "Coverage")
+-else()
+- set(CMAKE_BUILD_TYPE "Release")
+-endif()
+-
+ # Check for prerequisites
+
+ set(DEPS glib-2.0>=2.58 gtk+-3.0>=3.24)
diff --git a/link-math.patch b/link-math.patch
new file mode 100644
index 0000000..c6ba13c
--- /dev/null
+++ b/link-math.patch
@@ -0,0 +1,11 @@
+--- ayatana-ido-0.9.0/src/CMakeLists.txt.orig 2021-11-02 16:52:12.000000000 +0100
++++ ayatana-ido-0.9.0/src/CMakeLists.txt 2021-11-04 14:20:59.708636314 +0100
+@@ -98,7 +98,7 @@
+ set_source_files_properties(${SOURCES} PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS})
+ 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})
++target_link_libraries("ayatana-ido3-0.4" ${PROJECT_DEPS_LIBRARIES} m)
+ 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})
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ayatana-ido.git/commitdiff/fe921c98c5fcded45eded813c69d1b041797a395
More information about the pld-cvs-commit
mailing list