mirror of
https://github.com/OpenSelena/omniget.git
synced 2026-11-04 08:10:56 +00:00
feat(flatpak): update flathub submission package and app ID
This commit is contained in:
1 parent
dc42e80cdf
commit
e17e27fd1c
4 files changed
+71
-33
No files matched your search
@@ -135,7 +135,7 @@ modules:
|
||||
env:
|
||||
npm_config_cache: /run/build/omniget/flatpak-node/npm-cache
|
||||
build-commands:
|
||||
- npm install --offline
|
||||
- npm install --offline --legacy-peer-deps
|
||||
- npx vite build
|
||||
- cargo --offline build --release --manifest-path src-tauri/Cargo.toml
|
||||
- install -Dm755 src-tauri/target/release/omniget /app/bin/omniget
|
||||
|
||||
@@ -1,21 +1,51 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: OmniGet <noreply@tonho.wtf>
|
||||
Subject: [PATCH] Fix HAVE_VALGRIND AM_CONDITIONAL not defined when tests
|
||||
disabled
|
||||
From 729546c51806a1b3ea6cb6efb7a115b1baa811f1 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
|
||||
Date: Mon, 18 Nov 2019 19:58:53 +0100
|
||||
Subject: [PATCH 1/1] Fix HAVE_VALGRIND AM_CONDITIONAL
|
||||
|
||||
Move AM_CONDITIONAL(HAVE_VALGRIND, ...) outside the tests-only AS_IF
|
||||
block so it is always defined, even with --disable-tests.
|
||||
The AM_CONDITIONAL should also be run with --disable-tests, otherwise
|
||||
HAVE_VALGRIND is undefined.
|
||||
---
|
||||
configure | 4 ++--
|
||||
configure.ac | 2 +-
|
||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 831a3bb..8913b9b 100644
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -14801,6 +14801,8 @@ else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
have_valgrind=yes
|
||||
+fi
|
||||
+
|
||||
fi
|
||||
if test "x$have_valgrind" = "xyes"; then
|
||||
HAVE_VALGRIND_TRUE=
|
||||
@@ -14811,8 +14813,6 @@ else
|
||||
fi
|
||||
|
||||
|
||||
-fi
|
||||
-
|
||||
|
||||
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index ace54d1..cbd38a6 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -120,8 +120,8 @@
|
||||
@@ -120,8 +120,8 @@ PKG_CHECK_MODULES(DBUSMENUTESTS, json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
|
||||
[have_tests=yes]
|
||||
)
|
||||
PKG_CHECK_MODULES(DBUSMENUTESTSVALGRIND, valgrind, have_valgrind=yes, have_valgrind=no)
|
||||
-AM_CONDITIONAL([HAVE_VALGRIND], [test "x$have_valgrind" = "xyes"])
|
||||
])
|
||||
+AM_CONDITIONAL([HAVE_VALGRIND], [test "x$have_valgrind" = "xyes"])
|
||||
|
||||
|
||||
AC_SUBST(DBUSMENUTESTS_CFLAGS)
|
||||
AC_SUBST(DBUSMENUTESTS_LIBS)
|
||||
--
|
||||
2.46.2
|
||||
|
||||
@@ -1,38 +1,44 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: OmniGet <noreply@tonho.wtf>
|
||||
Subject: [PATCH] Make GObject introspection configurable
|
||||
From 8a09e6ad33c58c017c0c8fd756da036fc39428ea Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Koskovich <akoskovich@pm.me>
|
||||
Date: Sun, 29 Sep 2024 13:47:54 -0400
|
||||
Subject: [PATCH 1/1] Make introspection configurable
|
||||
|
||||
Add ENABLE_INTROSPECTION cmake option so introspection can be disabled
|
||||
with -DENABLE_INTROSPECTION=OFF.
|
||||
---
|
||||
CMakeLists.txt | 1 +
|
||||
src/CMakeLists.txt | 4 ++++
|
||||
2 files changed, 5 insertions(+)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 0e13fcd..f3e9ec0 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -10,6 +10,7 @@
|
||||
@@ -12,6 +12,7 @@ endif(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
|
||||
option(ENABLE_TESTS "Enable all tests and checks" OFF)
|
||||
option(ENABLE_COVERAGE "Enable coverage reports (includes enabling all tests and checks)" OFF)
|
||||
option(ENABLE_WERROR "Treat all build warnings as errors" OFF)
|
||||
+option(ENABLE_INTROSPECTION "Enable GObject introspection" ON)
|
||||
|
||||
+option(ENABLE_INTROSPECTION "Enable introspection" ON)
|
||||
|
||||
if(ENABLE_COVERAGE)
|
||||
set(ENABLE_TESTS ON)
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 5b3638d..aca9481 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -92,7 +92,7 @@
|
||||
install(TARGETS "ayatana-ido3-0.4" LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}")
|
||||
|
||||
@@ -108,6 +108,8 @@ install(TARGETS "ayatana-ido3-0.4" LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIB
|
||||
|
||||
# AyatanaIdo3-0.4.gir
|
||||
|
||||
-find_package(GObjectIntrospection REQUIRED QUIET)
|
||||
|
||||
+if (ENABLE_INTROSPECTION)
|
||||
+find_package(GObjectIntrospection REQUIRED QUIET)
|
||||
|
||||
+
|
||||
find_package(GObjectIntrospection REQUIRED QUIET)
|
||||
|
||||
if (INTROSPECTION_FOUND)
|
||||
|
||||
@@ -158,4 +158,5 @@
|
||||
|
||||
@@ -183,3 +185,5 @@ if (INTROSPECTION_FOUND)
|
||||
endif ()
|
||||
|
||||
|
||||
endif ()
|
||||
+
|
||||
+endif ()
|
||||
--
|
||||
2.46.2
|
||||
|
||||
+7
-5
@@ -1,4 +1,4 @@
|
||||
app-id: com.openselena.omniget
|
||||
app-id: io.github.OpenSelena.omniget
|
||||
runtime: org.gnome.Platform
|
||||
runtime-version: '51'
|
||||
sdk: org.gnome.Sdk
|
||||
@@ -135,13 +135,15 @@ modules:
|
||||
env:
|
||||
npm_config_cache: /run/build/omniget/flatpak-node/npm-cache
|
||||
build-commands:
|
||||
- npm install --offline
|
||||
- npm install --offline --legacy-peer-deps
|
||||
- npx vite build
|
||||
- cargo --offline build --release --manifest-path src-tauri/Cargo.toml
|
||||
- sed -i 's/com.openselena.omniget/io.github.OpenSelena.omniget/g' flatpak/com.openselena.omniget.metainfo.xml
|
||||
- sed -i 's/Icon=com.openselena.omniget/Icon=io.github.OpenSelena.omniget/g' flatpak/com.openselena.omniget.desktop
|
||||
- install -Dm755 src-tauri/target/release/omniget /app/bin/omniget
|
||||
- install -Dm644 flatpak/com.openselena.omniget.desktop /app/share/applications/com.openselena.omniget.desktop
|
||||
- install -Dm644 flatpak/com.openselena.omniget.metainfo.xml /app/share/metainfo/com.openselena.omniget.metainfo.xml
|
||||
- install -Dm644 flatpak/com.openselena.omniget.png /app/share/icons/hicolor/128x128/apps/com.openselena.omniget.png
|
||||
- install -Dm644 flatpak/com.openselena.omniget.desktop /app/share/applications/io.github.OpenSelena.omniget.desktop
|
||||
- install -Dm644 flatpak/com.openselena.omniget.metainfo.xml /app/share/metainfo/io.github.OpenSelena.omniget.metainfo.xml
|
||||
- install -Dm644 flatpak/com.openselena.omniget.png /app/share/icons/hicolor/128x128/apps/io.github.OpenSelena.omniget.png
|
||||
sources:
|
||||
- type: archive
|
||||
url: https://github.com/OpenSelena/omniget/archive/refs/tags/v0.14.0.tar.gz
|
||||
Reference in new issue
Block a user