diff --git a/0001-Fix-build-with-GCC13.patch b/0001-Fix-build-with-GCC13.patch deleted file mode 100644 index 8161f947fd20cc513d23cb74e1cc5b1a3217e383..0000000000000000000000000000000000000000 --- a/0001-Fix-build-with-GCC13.patch +++ /dev/null @@ -1,48 +0,0 @@ -From c68f5f9cade8a890efefcb4c2e0fc57762211286 Mon Sep 17 00:00:00 2001 -From: Elliott Sales de Andrade -Date: Fri, 24 Feb 2023 14:01:18 -0500 -Subject: [PATCH] Fix build with GCC13 - -GCC 13 now complains about this line: -``` -src/ui/widget/selected-style.cpp:111:6: error: statement-expressions are not allowed outside functions nor in template-argument lists - 111 | {g_strdup("application/x-oswb-color"), 0, APP_OSWB_COLOR} - | ^~~~~~~~ -``` - -However, it is not necessary to strdup the string constant as the value -just needs to exist indefinitely, and it will as a constant. While C -doesn't mind the `const` difference, a simple cast will silence C++'s -higher strictness. - -And in fact, the other use of `GtkTargetEntry` in -`src/ui/drag-and-drop.cpp` does the same cast. - -Signed-off-by: Elliott Sales de Andrade ---- - src/ui/widget/selected-style.cpp | 8 +------- - 1 file changed, 1 insertion(+), 7 deletions(-) - -diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp -index 68fe1fc426..7274f1b74c 100644 ---- a/src/ui/widget/selected-style.cpp -+++ b/src/ui/widget/selected-style.cpp -@@ -100,14 +100,8 @@ enum ui_drop_target_info { - APP_OSWB_COLOR - }; - --//TODO: warning: deprecated conversion from string constant to ‘gchar*’ --// --//Turn out to be warnings that we should probably leave in place. The --// pointers/types used need to be read-only. So until we correct the using --// code, those warnings are actually desired. They say "Hey! Fix this". We --// definitely don't want to hide/ignore them. --JonCruz - static const GtkTargetEntry ui_drop_target_entries [] = { -- {g_strdup("application/x-oswb-color"), 0, APP_OSWB_COLOR} -+ {(gchar *)"application/x-oswb-color", 0, APP_OSWB_COLOR} - }; - - static guint nui_drop_target_entries = G_N_ELEMENTS(ui_drop_target_entries); --- -2.39.2 - diff --git a/inkscape-1.2.2.tar.xz b/inkscape-1.3.tar.xz similarity index 45% rename from inkscape-1.2.2.tar.xz rename to inkscape-1.3.tar.xz index 62b3f53a58fd9b2c81127e2c183668aa143d7a53..2a93815fefee1b02f40bb826b1b7fba26edcc574 100644 Binary files a/inkscape-1.2.2.tar.xz and b/inkscape-1.3.tar.xz differ diff --git a/inkscape.spec b/inkscape.spec index b2581569765df014fd73a01cc89a8c1dbcb78dd3..a43688f78e646bacd01c54ffbd9821ab5259a73b 100644 --- a/inkscape.spec +++ b/inkscape.spec @@ -1,16 +1,14 @@ -%define anolis_release 3 +%define anolis_release 1 %define debug_package %{nil} %bcond_with graphicsmagick Name: inkscape -Version: 1.2.2 +Version: 1.3 Release: %{anolis_release}%{?dist} Summary: Vector-based drawing program using SVG License: GPL-2.0-or-later AND CC-BY-3.0 URL: https://inkscape.org/ -Source0: https://inkscape.org/gallery/item/37360/inkscape-1.2.2.tar.xz -# https://gitlab.com/inkscape/inkscape/-/merge_requests/5108 -Patch: 0001-Fix-build-with-GCC13.patch +Source0: https://inkscape.org/release/inkscape-%{version}/source/archive/xz/dl/inkscape-%{version}.tar.xz Provides: bundled(libcroco) Provides: bundled(autotrace) @@ -20,7 +18,7 @@ Provides: bundled(adaptagrams) Provides: bundled(lib2geom) BuildRequires: gcc-c++ -BuildRequires: aspell-devel aspell-en +BuildRequires: hunspell-devel hunspell-en BuildRequires: atk-devel BuildRequires: boost-devel BuildRequires: cairo-devel @@ -56,7 +54,6 @@ BuildRequires: libtool BuildRequires: potrace-devel BuildRequires: cmake BuildRequires: libwpd-devel -BuildRequires: dbus-glib-devel BuildRequires: libjpeg-devel BuildRequires: libsigc++20-devel BuildRequires: libsoup-devel @@ -108,7 +105,7 @@ graphics in W3C standard Scalable Vector Graphics (SVG) file format. %prep -%autosetup -n inkscape-1.2.2_2022-12-01_b0a8486541 -p1 +%autosetup -n %{name}-%{version}_2023-07-21_0e150ed6c4 -p1 %py3_shebang_fix . find . -name CMakeLists.txt | xargs sed -i 's|COMMAND python |COMMAND %{__python3} |g' @@ -140,7 +137,7 @@ dos2unix -k -q share/extensions/*.py rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/extensions/sk2svg.sh # Don't install development files for bundled libraries -rm -r $RPM_BUILD_ROOT%{_includedir}/2geom-1.2.2/ +rm -r $RPM_BUILD_ROOT%{_includedir}/2geom-1.3.0/ rm -r $RPM_BUILD_ROOT%{_libdir}/cmake/2Geom rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/2geom.pc @@ -155,10 +152,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/lib2geom.a # Validate appdata file appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/metainfo/*.appdata.xml -# Validate desktop file -desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.inkscape.Inkscape.desktop - - %files -f %{name}.lang %license COPYING %{_bindir}/inkscape @@ -203,10 +196,13 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.inkscape.Inksc %changelog -* Thu May 4 2023 Funda Wang 1.2.2-3 +* Sun Jul 30 2023 Funda Wang - 1.3-1 +- New version 1.3 + +* Thu May 4 2023 Funda Wang - 1.2.2-3 - Rebuild for new poppler -* Tue Apr 18 2023 Funda Wang 1.2.2-2 +* Tue Apr 18 2023 Funda Wang - 1.2.2-2 - Rebuild for new poppler * Sat Mar 25 2023 happy_orange - 1.2.2-1