From 5c28990a1c0ded1bb3f0f003c22103d1071d5d3ebe9019dd254256f1d65a5ad3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 18 Nov 2024 15:03:38 +0000 Subject: [PATCH] - Add gcc14,patch:Fix build using stricter gcc 14. OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/appimaged?expand=0&rev=9 --- .gitattributes | 23 +++++++++ .gitignore | 1 + AppImageKit-10.obscpio | 3 ++ AppImageKit.obsinfo | 5 ++ _service | 15 ++++++ appimaged.changes | 48 ++++++++++++++++++ appimaged.service | 12 +++++ appimaged.spec | 112 +++++++++++++++++++++++++++++++++++++++++ gcc14,patch | 12 +++++ 9 files changed, 231 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 AppImageKit-10.obscpio create mode 100644 AppImageKit.obsinfo create mode 100644 _service create mode 100644 appimaged.changes create mode 100644 appimaged.service create mode 100644 appimaged.spec create mode 100644 gcc14,patch diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/AppImageKit-10.obscpio b/AppImageKit-10.obscpio new file mode 100644 index 0000000..6b1a6ca --- /dev/null +++ b/AppImageKit-10.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:31a49915e981c6f06e0e091f4d41a8277c48638154c8bf72b1c94e897293d883 +size 1638412 diff --git a/AppImageKit.obsinfo b/AppImageKit.obsinfo new file mode 100644 index 0000000..cba84b8 --- /dev/null +++ b/AppImageKit.obsinfo @@ -0,0 +1,5 @@ +name: AppImageKit +version: 10 +mtime: 1510255277 +commit: 6f3138f02701a7b52959f16f2ee6b540bf5b3dc5 + diff --git a/_service b/_service new file mode 100644 index 0000000..4b995b7 --- /dev/null +++ b/_service @@ -0,0 +1,15 @@ + + + https://github.com/AppImage/AppImageKit.git + 10 + 10 + enable + git + + + + + *.tar + xz + + diff --git a/appimaged.changes b/appimaged.changes new file mode 100644 index 0000000..fc3fc26 --- /dev/null +++ b/appimaged.changes @@ -0,0 +1,48 @@ +------------------------------------------------------------------- +Mon Nov 18 13:48:22 UTC 2024 - Dominique Leuenberger + +- Add gcc14,patch:Fix build using stricter gcc 14. + +------------------------------------------------------------------- +Sun Feb 28 09:56:55 UTC 2021 - Wolfgang Rosenauer + +- use current repo as source +- changed service to default.target + +------------------------------------------------------------------- +Wed Jan 24 07:46:07 UTC 2018 - adrian@suse.de + +- update to version 10 + +------------------------------------------------------------------- +Tue May 30 12:23:38 UTC 2017 - adrian@suse.de + +- prepare for factory submission + +------------------------------------------------------------------- +Mon Feb 27 07:37:46 UTC 2017 - adrian@suse.de + +- update to version 8 +- package it in a way to make it usable for rpm2appimage for OBS + +------------------------------------------------------------------- +Tue Jan 24 18:11:11 UTC 2017 - jengelh@inai.de + +- Resolve some typographical issues in description. + Use %setup's options instead of tar. + +------------------------------------------------------------------- +Tue Jan 24 11:57:18 UTC 2017 - i@marguerite.su + +- packaging as native distro package instead of appimage +- add a systemd per-user service appimaged.service +- add mkappimagedir script to create skeleton AppImage.Dir + for the end users. + +------------------------------------------------------------------- +Tue Dec 20 10:09:03 UTC 2016 - i@marguerite.su + +- initial version +- add appimagekit-abuild.patch + + diff --git a/appimaged.service b/appimaged.service new file mode 100644 index 0000000..256dd40 --- /dev/null +++ b/appimaged.service @@ -0,0 +1,12 @@ +[Unit] +Description=AppImage daemon +After=basic.target + +[Service] +ExecStart=/usr/bin/appimaged +Restart=always +RestartSec=5s +StartLimitInterval=0 + +[Install] +WantedBy=default.target diff --git a/appimaged.spec b/appimaged.spec new file mode 100644 index 0000000..a91c4a3 --- /dev/null +++ b/appimaged.spec @@ -0,0 +1,112 @@ +# +# spec file for package appimaged +# +# Copyright (c) 2024 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +Name: appimaged +Version: 10 +Release: 0 +URL: http://www.appimage.org +Summary: Daemon handles (un)registering AppImages with the system +License: MIT +Group: System/Daemons +Source0: AppImageKit-%version.tar.xz +Source1: appimaged.service +Patch0: gcc14,patch +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: cairo-devel +BuildRequires: fuse-devel +BuildRequires: glib2-devel +BuildRequires: inotify-tools-devel +BuildRequires: libarchive-devel +BuildRequires: libpng-devel +BuildRequires: libtool +BuildRequires: openssl-devel +BuildRequires: systemd-rpm-macros +BuildRequires: xz-devel +Requires: zsync + +%description +appimaged is a daemon that handles registering and unregistering AppImages +with the system (e.g., menu entries, icons, MIME types, binary delta updates, +and such). + +The package comes also with appimage.validate CLI tool to verify signature +of AppImage files. + +%prep +%autosetup -p1 -n AppImageKit-%version +sed -i -e s,^version=.*,version=%version, build.sh + +%build +export PATH=$PWD/bin:$PATH +# Upstream squashfuse is not providing a lib, so it gets patched to produce one here +cd squashfuse +patch -p1 < ../squashfuse.patch +export ACLOCAL_FLAGS="-I /usr/share/aclocal" +libtoolize --force +aclocal +autoheader +automake --force-missing --add-missing +autoreconf -fi || true # Errors out, but the following succeeds then? +autoconf +sed -i '/PKG_CHECK_MODULES.*/,/,:./d' configure # https://github.com/vasi/squashfuse/issues/12 +./configure --disable-demo --disable-high-level --without-lzo --without-lz4 +make +cd .. + +CC=gcc +$CC -std=gnu99 -o appimaged -I./squashfuse/ ./getsection.c ./notify.c ./elf.c ./appimaged.c \ + -D_FILE_OFFSET_BITS=64 -DHAVE_LIBARCHIVE3=0 -DVERSION_NUMBER=\"%version\" \ + ./squashfuse/.libs/libsquashfuse.a ./squashfuse/.libs/libfuseprivate.a \ + -Wl,-Bdynamic -linotifytools -larchive \ + -Wl,--as-needed \ + $(pkg-config --cflags --libs glib-2.0) \ + $(pkg-config --cflags --libs gio-2.0) \ + $(pkg-config --cflags --libs cairo) \ + -ldl -lpthread -lz -llzma + +# basic tool for validation of downloaded appimage files +$CC -o appimage.validate ./getsection.c ./validate.c -Wl,-Bdynamic -lssl -lcrypto \ + -Wl,--as-needed $(pkg-config --cflags --libs glib-2.0) -lz -ldl + +%install +mkdir -p %{buildroot}%{_bindir} +install -m 0755 appimaged appimage.validate %{buildroot}%{_bindir} + +# install systemd per user service +mkdir -p %{buildroot}%{_userunitdir} +install -m 0644 %{SOURCE1} %{buildroot}%{_userunitdir}/appimaged.service + +%post +%systemd_user_post appimaged.service + +%preun +%systemd_user_preun appimaged.service + +%postun +%systemd_user_postun appimaged.service + +%files +%defattr(-,root,root) +%license LICENSE +%doc README.md +%{_bindir}/appimage.validate +%{_bindir}/appimaged +%{_userunitdir}/appimaged.service + +%changelog diff --git a/gcc14,patch b/gcc14,patch new file mode 100644 index 0000000..b04e8d9 --- /dev/null +++ b/gcc14,patch @@ -0,0 +1,12 @@ +Index: AppImageKit/squashfuse/ll.c +=================================================================== +--- AppImageKit.orig/squashfuse/ll.c ++++ AppImageKit/squashfuse/ll.c +@@ -33,6 +33,7 @@ + #include + #include + #include ++#include + + static const double SQFS_TIMEOUT = DBL_MAX; +