commit opentoonz for openSUSE:Leap:15.2
Hello community,
here is the log from the commit of package opentoonz for openSUSE:Leap:15.2
checked in at 2020-05-16 04:57:16
Comparing /work/SRC/openSUSE:Leap:15.2/opentoonz (Old)
and /work/SRC/openSUSE:Leap:15.2/.opentoonz.new.2738 (New)
Package is "opentoonz"
Sat May 16 04:57:16 2020 rev:12 rq:795489 version:1.4.0
Changes:
--- /work/SRC/openSUSE:Leap:15.2/opentoonz/opentoonz.changes2020-04-02
16:47:36.405768985 +0200
+++ /work/SRC/openSUSE:Leap:15.2/.opentoonz.new.2738/opentoonz.changes
2020-05-16 04:57:23.563944975 +0200
@@ -1,0 +2,10 @@
+Mon Apr 13 18:35:09 UTC 2020 - Christophe Giboudeaux
+
+- Drop p_add-zlo-to-cmake-include-path-suffixes.patch, no
+ longer needed
+- Add patches:
+ * 0001-Fix-linker-errors-on-Linux.patch
+ * 0001-Use-the-system-mypaint-brushes.patch
+- Small spec cleanup
+
+---
Old:
p_add-zlo-to-cmake-include-path-suffixes.patch
New:
0001-Fix-linker-errors-on-Linux.patch
0001-Use-the-system-mypaint-brushes.patch
Other differences:
--
++ opentoonz.spec ++
--- /var/tmp/diff_new_pack.sbDD7v/_old 2020-05-16 04:57:24.047945967 +0200
+++ /var/tmp/diff_new_pack.sbDD7v/_new 2020-05-16 04:57:24.047945967 +0200
@@ -16,8 +16,6 @@
#
-%global __requires_exclude ^(libcolorfx|libimage|libsound|libtif).*
-%global __provides_exclude ^(libcolorfx|libimage|libsound|libtif).*
Name: opentoonz
Version:1.4.0
Release:0
@@ -29,7 +27,10 @@
Source0:%{name}-%{version}.tar.xz
Source3:%{name}-rpmlintrc
Patch1: p_handle-no-return-in-nonvoid-function.patch
-Patch2: p_add-zlo-to-cmake-include-path-suffixes.patch
+# PATCH-FIX-UPSTREAM
+Patch2: 0001-Fix-linker-errors-on-Linux.patch
+# PATCH-FIX-OPENSUSE -- Use the system mypaint brushes
+Patch3: 0001-Use-the-system-mypaint-brushes.patch
BuildRequires: boost-devel >= 1.55
BuildRequires: cmake
BuildRequires: freeglut-devel
@@ -64,6 +65,13 @@
BuildRequires: pkgconfig(sdl2)
BuildRequires: pkgconfig(zlib)
ExclusiveArch: i586 x86_64
+# the package is called mypaint-brushes1 in the devel project,
+# but mypaint-brushes in the Leap:15.2 repo.
+%if 0%{?sle_version} == 150200
+Requires: mypaint-brushes < 2.0
+%else
+Requires: mypaint-brushes1
+%endif
%description
2D animation software previously known as Toonz.
@@ -76,21 +84,24 @@
# Keep thirdparty/lzo/driver, but remove library.
rm -r thirdparty/lzo/2.*
+# Use the mypaint brushes instead of the local copy
+rm -fr stuff/library/mypaint\ brushes
+
%build
+
# TODO upstream planning to replace custom thirdparty libs with system versions
cd thirdparty/tiff-*
export CFLAGS="%{optflags} -fPIC"
-%configure
+%configure --disable-jbig
%make_build
cd -
cd toonz
%define __sourcedir sources
%cmake \
- -DCMAKE_EXE_LINKER_FLAGS="-Wl,--no-as-needed" \
- -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--no-as-needed" \
- -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--no-as-needed" \
- -DCMAKE_SKIP_RPATH=TRUE
+ -DCMAKE_SKIP_RPATH=TRUE \
+ -DWITH_SYSTEM_LZO=TRUE \
+ -DWITH_SYSTEM_SUPERLU=TRUE
%cmake_build
++ 0001-Fix-linker-errors-on-Linux.patch ++
>From 8ce3c36cc6c7b311a8f970123798e8db0dca5393 Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux
Date: Mon, 13 Apr 2020 10:14:42 +0200
Subject: [PATCH] Fix linker errors on Linux.
OpenToonz uses dlopen in a couple places, so it needs to link 'dl'.
---
toonz/sources/tnzcore/CMakeLists.txt | 2 +-
toonz/sources/toonzqt/CMakeLists.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/toonz/sources/tnzcore/CMakeLists.txt
b/toonz/sources/tnzcore/CMakeLists.txt
index d637cd26..12b4d5da 100644
--- a/toonz/sources/tnzcore/CMakeLists.txt
+++ b/toonz/sources/tnzcore/CMakeLists.txt
@@ -356,5 +356,5 @@ endif()
target_link_libraries(tnzcore
Qt5::OpenGL Qt5::Network Qt5::Multimedia
${GL_LIB} ${GLUT_LIB} ${QT_LIB} ${Z_LIB} ${JPEG_LIB} ${LZ4_LIB}
-${EXTRA_LIBS}
+${EXTRA_LIBS} ${CMAKE_DL_LIBS}
)
diff --git a/toonz/sources/toonzqt/CMakeLists.txt
b/toonz/sources/toonzqt/CMakeLists.txt
index 3c1a329e..ee6a7139 100644
--- a/toonz/sources/toonzqt/CMakeLists.txt
+++ b/toonz/sources/toonzqt/CMakeLists.txt
@@ -246,4 +246,4 @@ elseif(BUILD_ENV_UNIXLIKE)
endif()
endif()
-target_link_libraries(toonzqt Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network
Qt5::OpenGL Qt5::Svg ${EXTRA_LIBS} ${GL_LIB})
+target_link_libraries(toonzqt Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network
Qt5::OpenGL Qt5::Svg ${EXTRA_LIBS} ${GL_LIB} ${CMAKE_DL_LIBS})
--
2.26.0
++ 0001-Use-the-system-mypaint-brushes.patch ++
>From 9ed962d41dce825c60df869c96f062b3906cbc8d Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux
commit opentoonz for openSUSE:Leap:15.2
Hello community, here is the log from the commit of package opentoonz for openSUSE:Leap:15.2 checked in at 2020-04-02 16:47:34 Comparing /work/SRC/openSUSE:Leap:15.2/opentoonz (Old) and /work/SRC/openSUSE:Leap:15.2/.opentoonz.new.3248 (New) Package is "opentoonz" Thu Apr 2 16:47:34 2020 rev:11 rq:789158 version:1.4.0 Changes: --- /work/SRC/openSUSE:Leap:15.2/opentoonz/opentoonz.changes2020-01-15 15:37:24.911027222 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.opentoonz.new.3248/opentoonz.changes 2020-04-02 16:47:36.405768985 +0200 @@ -1,0 +2,697 @@ +Thu Mar 26 16:05:38 UTC 2020 - Christophe Giboudeaux + +- Disable RPATH to fix the leap build. + +--- +Wed Mar 11 09:00:27 UTC 2020 - Christophe Giboudeaux + +- Require freeglut-devel instead of pkgconfig(freeglut). + The pkgconfig name changed in Tumbleweed. + +--- +Sat Feb 01 15:58:57 UTC 2020 - christo...@krop.fr + +- Update to v1.4.0. Check + https://github.com/opentoonz/opentoonz/releases/tag/v1.4.0 for + the full changelog. +- Replace tar_scm with obs_scm in the _service file. + +--- +Mon Jan 27 17:15:35 UTC 2020 - Christophe Giboudeaux + +- Update to 1.4.0rc. Check + https://github.com/opentoonz/opentoonz/releases/tag/v1.4.0rc for + the full changelog. + * New Guided Drawing/Autoinbetweening + * New XDTS File Support (Celsys and Toei Animation xsheet file format Import/Export) + * New Cache folder Replacement & Clear Cache Command + * New Camera Column in XSheet + * New Context Aware Toolbar + * New Create Blank Drawing command + * New Fx: Corridor Gradient Fx Iwa + * New Fx: Spin Gradient Fx Iwa + * New Geometry Tool Driven Motion Paths + * New (Initial) Korean Menu Translation + * New Level Settings Adjustment for Multiple Selections in XSheet/Timeline + * New Next/Previous Keyframe Shortcuts + * New Pencil Mode for Toonz Raster Eraser in Freehand and Polyline + * New Swap Colors Button for Gradient Fxs + * New Short Play Feature + * New Fill Tool for Raster Level + * Updated/Reorganized Menus +- Refresh p_handle-no-return-in-nonvoid-function.patch +- Drop Fix-build-with-Qt-5_13.patch. Fixed upstream + +--- +Sat Oct 12 10:23:55 UTC 2019 - christo...@krop.fr + +- Update to version v1.3.0: + * forbidden cursor for CURSOR_NO (#2489) + * Fix improperly disabled tools on secondary level frame (#2487) + * Fix style picker and type tools invalid status (#2483) + * Fix Z=0 Camera Preview crash (#2405) + * Call leftButtonDown on tool switches + * Prevent crash on deactivation on empty cell + * Fix left extender handle position on sound levels + * Fix ParticlesFx Crash When Inputting Blank Vector Level To the Texture Port (#2459) + * test using QPointer::data for sender argument + * update qt version of travis-linux + * fix_vector_replacement_crash + * v1.3.0 (#2461) + * Update Chinese UI translation for v1.3 (#2465) + * russian translation for v1.3 (#2464) + * Spanish 4 (#2453) + * Translation files update for v1.3 (#2448) + * fix separate colors (#2449) + * Improved onion skin marker targeting (#2378) + * Fix fx schematic display issues (#2407) + * Remove Version Numbers from File Names (#2410) + * add warning popup for duplicate command on xsheet (#2447) + * fix motion blur fx alias (#2446) + * Duplicate in timeline (#2342) + * Fix schematic group node display issue (#2403) + * Fix loading macrofx preset issue (#2425) + * Fix replace fx nodes (#2417) + * Fix Palette gizmo crash (#2413) + * update tool state on level switch (#2428) + * fix pressure lost (#2431) + * revert fx list (#2444) + * Fix eraser mode switch crash (#2396) + * Fix incorrect keyframe cell pasting and redo (#2398) + * Fix empty column property issues (#2395) + * Fix moving note cells crash (#2392) + * Fix restoring erase tool crash (#2389) + * Fix processing touchEvents after tablet events (#2382) + * Fix Current Frame on Load Level (#2375) + * Fix wrong line cap loading (#2374) + * Fix raster crash after unhiding column (#2369) + * Fix Hide/Lock shortcut bug (#2365) + * Fix raster paste crash (#2364) + * matte color (#2418) + * Fix svg stroke thickness (#2358) + * Bugfix in svg import. Incorrect arc parsing if arc contains only one segment. (#2345) + * Default and setting Interpolations (#2344) + * improve jpeg chroma subsampling (#2419) + * fix renaming psd cell (#2416) + * reload psd level (#2415) + * New Feature: Separate Colors (#2402) + * New Fx: Text Fx Iwa (#2393) + * Allow Increase Step and Decrease Step to work even in selection is lost. (#2343) + * Fix antialiasing (#2289) + * fix
