commit de5d0ac4108fd329f48ef63113b012d91fd140ca Author: Mikhail Novosyolov Date: Sat Jun 5 16:15:40 2021 +0300 init (ayatana stack is needed for newest virt-manager) diff --git a/.abf.yml b/.abf.yml new file mode 100644 index 0000000..433a863 --- /dev/null +++ b/.abf.yml @@ -0,0 +1,2 @@ +sources: + ayatana-ido-e11bf6e8d7795cb76fea3b83ed1d6fed5a86e1b9.tar.gz: 5f21a39026cd3eced4ddb1ffc4953e767fff0e3d diff --git a/ayatana-ido.spec b/ayatana-ido.spec new file mode 100644 index 0000000..6e383e1 --- /dev/null +++ b/ayatana-ido.spec @@ -0,0 +1,100 @@ +# upstream moved from autootls to cmake +# let's build using cmake right now +%define commit e11bf6e8d7795cb76fea3b83ed1d6fed5a86e1b9 +%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 + +%define major 0 +%define api 0.4 +%define libname %mklibname libayatana-ido3-%{api} %{major} +%define devname %mklibname libayatana-ido3-%{api} -d +%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} + +Summary: Ayatana Indicator Display Objects +Name: ayatana-ido +Version: 0.8.2 +Release: 1.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 +BuildRequires: gtk-doc +BuildRequires: gobject-introspection-devel +BuildRequires: vala-devel +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gtk+-3.0) + +%description +%{summary} + +#------------------------------------------------------------------ + +%package -n %{libname} +Summary: Ayatana Indicator Display Objects library, API %{api} +Group: System/Libraries + +%description -n %{libname} +Ayatana Indicator Display Objects library, API %{api} + +%files -n %{libname} +%{_libdir}/libayatana-ido3-%{api}.so.%{major}* + +#------------------------------------------------------------------ + +%package -n %{girname} +Summary: Ayatana Indicator Display Objects gir +Group: System/Libraries + +%description -n %{girname} +Ayatana Indicator Display Objects gir + +%files -n %{girname} +%{_libdir}/girepository-1.0/AyatanaIdo3-%{api}.typelib + +#------------------------------------------------------------------ + +%package -n %{devname} +Summary: Ayatana Indicator Display Objects library development files +Group: Development/C +Requires: %{libname} = %{EVRD} +Requires: %{girname} = %{EVRD} +Provides: %{name}-devel = %{EVRD} + +%description -n %{devname} +Ayatana Indicator Display Objects library development files + +%files -n %{devname} +%{_libdir}/libayatana-ido3-%{api}.so +%{_libdir}/pkgconfig/libayatana-ido3-%{api}.pc +%{_includedir}/libayatana-ido3-%{api} +%{_datadir}/gir-1.0/AyatanaIdo3-%{api}.gir +%{_datadir}/vala/vapi/AyatanaIdo3-0.4.vapi + +#------------------------------------------------------------------ + +%prep +%autosetup -p1 -n %{name}-%{commit} + +%build +%cmake +%make + +%install +%makeinstall_std -C build + +# https://github.com/AyatanaIndicators/ayatana-ido/issues/40 +#mv -v %{buildroot}/usr/usr/* %{buildroot}/usr +#rmdir %{buildroot}/usr/usr diff --git a/c2d6ee0c3b3bef64b26e5226721fa39a28e61100.patch b/c2d6ee0c3b3bef64b26e5226721fa39a28e61100.patch new file mode 100644 index 0000000..928c3fd --- /dev/null +++ b/c2d6ee0c3b3bef64b26e5226721fa39a28e61100.patch @@ -0,0 +1,20 @@ +From c2d6ee0c3b3bef64b26e5226721fa39a28e61100 Mon Sep 17 00:00:00 2001 +From: Robert Tari +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 diff --git a/cmake.diff b/cmake.diff new file mode 100644 index 0000000..e9faaad --- /dev/null +++ b/cmake.diff @@ -0,0 +1,79 @@ +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")