Djam/ayatana-ido
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/ayatana-ido.git synced 2025-02-23 15:52:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

update to git master, removed merged and no more needed patches

Browse source
This commit is contained in:
Mikhail Novosyolov 2021-06-08 10:50:12 +03:00
parent de5d0ac410
commit 85bdd43694
4 changed files with 5 additions and 112 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.abf.yml
View file

@ -1,2 +1,2 @@
sources:
ayatana-ido-e11bf6e8d7795cb76fea3b83ed1d6fed5a86e1b9.tar.gz: 5f21a39026cd3eced4ddb1ffc4953e767fff0e3d
ayatana-ido-f754c6a24bbe09e3c9c28873487c03022fdce399.tar.gz: f55377f49463cf996cbf8b379c0704d4c286b539

16
ayatana-ido.spec
View file

@ -1,10 +1,10 @@
# upstream moved from autootls to cmake
# let's build using cmake right now
%define commit e11bf6e8d7795cb76fea3b83ed1d6fed5a86e1b9
%define commit f754c6a24bbe09e3c9c28873487c03022fdce399
%define commit_short %(echo %{commit} | head -c 6)
# https://github.com/AyatanaIndicators/ayatana-ido/issues/39
%global optflags %{optflags} %(pkg-config --libs gtk+-3.0 || :) -lm
%global ldflags %{ldflags} %(pkg-config --libs gtk+-3.0 || :) -lm
%define major 0
%define api 0.4
@ -13,21 +13,17 @@
%define girname %mklibname ayatanaido3-gir %{api}
# XXX debugsourcefiles.list is empty, maybe cmake is misconfigured
# like https://github.com/AyatanaIndicators/ayatana-ido/issues/40
%define debug_package %{nil}
%global debugcflags %{nil}
Summary: Ayatana Indicator Display Objects
Name: ayatana-ido
Version: 0.8.2
Release: 1.git%{commit_short}.1
Release: 2.git%{commit_short}.1
License: LGPLv3
Group: Graphical desktop/Other
Url: https://github.com/AyatanaIndicators/ayatana-ido
Source0: https://github.com/AyatanaIndicators/ayatana-ido/archive/%{commit}.tar.gz?/%{name}-%{commit}.tar.gz
# https://github.com/AyatanaIndicators/ayatana-ido/pull/38
Patch1: c2d6ee0c3b3bef64b26e5226721fa39a28e61100.patch
# https://github.com/AyatanaIndicators/ayatana-ido/issues/40
Patch2: cmake.diff
BuildRequires: cmake
BuildRequires: intltool
@ -94,7 +90,3 @@ Ayatana Indicator Display Objects library development files
%install
%makeinstall_std -C build
# https://github.com/AyatanaIndicators/ayatana-ido/issues/40
#mv -v %{buildroot}/usr/usr/* %{buildroot}/usr
#rmdir %{buildroot}/usr/usr

20
c2d6ee0c3b3bef64b26e5226721fa39a28e61100.patch
View file

@ -1,20 +0,0 @@
From c2d6ee0c3b3bef64b26e5226721fa39a28e61100 Mon Sep 17 00:00:00 2001
From: Robert Tari <robert@tari.in>
Date: Fri, 4 Jun 2021 14:09:11 +0200
Subject: [PATCH] data/libayatana-ido3-0.4.pc.in: Add glib-2.0 dependency
fixes https://github.com/AyatanaIndicators/ayatana-ido/issues/37
---
data/libayatana-ido3-0.4.pc.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/libayatana-ido3-0.4.pc.in b/data/libayatana-ido3-0.4.pc.in
index b1da305..c371c20 100644
--- a/data/libayatana-ido3-0.4.pc.in
+++ b/data/libayatana-ido3-0.4.pc.in
@@ -8,4 +8,4 @@ Description: Ayatana Indicator Display Objects
Version: @PROJECT_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

79
cmake.diff
View file

@ -1,79 +0,0 @@
https://github.com/AyatanaIndicators/ayatana-ido/issues/40
/usr/usr -> /usr
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 2f15bf6..de5f51b 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -1,4 +1,4 @@
# libayatana-ido3-0.4.pc
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/libayatana-ido3-0.4.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libayatana-ido3-0.4.pc" @ONLY)
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libayatana-ido3-0.4.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig/")
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libayatana-ido3-0.4.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig/")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 36132fe..055a2d5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -7,14 +7,14 @@
# idotimeline.h
# libayatana-ido.h
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/ayatanamenuitemfactory.h" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/libayatana-ido3-0.4/libayatana-ido")
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/idocalendarmenuitem.h" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/libayatana-ido3-0.4/libayatana-ido")
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/idoentrymenuitem.h" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/libayatana-ido3-0.4/libayatana-ido")
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/idorange.h" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/libayatana-ido3-0.4/libayatana-ido")
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/idoscalemenuitem.h" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/libayatana-ido3-0.4/libayatana-ido")
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/idoswitchmenuitem.h" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/libayatana-ido3-0.4/libayatana-ido")
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/idotimeline.h" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/libayatana-ido3-0.4/libayatana-ido")
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/libayatana-ido.h" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/libayatana-ido3-0.4/libayatana-ido")
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/ayatanamenuitemfactory.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/libayatana-ido3-0.4/libayatana-ido")
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/idocalendarmenuitem.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/libayatana-ido3-0.4/libayatana-ido")
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/idoentrymenuitem.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/libayatana-ido3-0.4/libayatana-ido")
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/idorange.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/libayatana-ido3-0.4/libayatana-ido")
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/idoscalemenuitem.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/libayatana-ido3-0.4/libayatana-ido")
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/idoswitchmenuitem.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/libayatana-ido3-0.4/libayatana-ido")
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/idotimeline.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/libayatana-ido3-0.4/libayatana-ido")
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/libayatana-ido.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/libayatana-ido3-0.4/libayatana-ido")
set(HEADERS
idorange.h
@@ -102,9 +102,9 @@ 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})
target_compile_definitions("ayatana-ido3-0.4" PUBLIC G_LOG_DOMAIN="IDO")
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libayatana-ido3-0.4.so" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libayatana-ido3-0.4.so.0" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libayatana-ido3-0.4.so.0.0.0" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libayatana-ido3-0.4.so" DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libayatana-ido3-0.4.so.0" DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libayatana-ido3-0.4.so.0.0.0" DESTINATION "${CMAKE_INSTALL_LIBDIR}")
# ayatana-ido3-0.4.gir
@@ -139,7 +139,7 @@ add_custom_command(
--output "${CMAKE_CURRENT_BINARY_DIR}/AyatanaIdo3-0.4.gir"
)
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/AyatanaIdo3-0.4.gir" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/gir-1.0")
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/AyatanaIdo3-0.4.gir" DESTINATION "${CMAKE_INSTALL_DATADIR}/gir-1.0")
# ayatana-ido3-0.4.typelib
@@ -154,7 +154,7 @@ add_custom_command(
-o "${CMAKE_CURRENT_BINARY_DIR}/AyatanaIdo3-0.4.typelib"
)
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/AyatanaIdo3-0.4.typelib" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/girepository-1.0")
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/AyatanaIdo3-0.4.typelib" DESTINATION "${CMAKE_INSTALL_LIBDIR}/girepository-1.0")
# ayatana-ido3-0.4.vapi
@@ -171,6 +171,6 @@ add_custom_command(
AyatanaIdo3-0.4.gir
)
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/AyatanaIdo3-0.4.vapi" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/vala/vapi")
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/AyatanaIdo3-0.4.vapi" DESTINATION "${CMAKE_INSTALL_DATADIR}/vala/vapi")
add_custom_target("src" ALL DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/AyatanaIdo3-0.4.vapi")