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.changes 2020-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 <christo...@krop.fr>
+
+- 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 <christo...@krop.fr>
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 <christo...@krop.fr>
Date: Mon, 13 Apr 2020 18:42:56 +0200
Subject: [PATCH] Use the system mypaint brushes.
---
toonz/sources/toonzlib/mypaintbrushstyle.cpp | 3 +++
1 file changed, 3 insertions(+)
diff --git a/toonz/sources/toonzlib/mypaintbrushstyle.cpp
b/toonz/sources/toonzlib/mypaintbrushstyle.cpp
index b299c106..adfb30db 100644
--- a/toonz/sources/toonzlib/mypaintbrushstyle.cpp
+++ b/toonz/sources/toonzlib/mypaintbrushstyle.cpp
@@ -76,6 +76,9 @@ std::string TMyPaintBrushStyle::getBrushType() { return
"myb"; }
TFilePathSet TMyPaintBrushStyle::getBrushesDirs() {
TFilePathSet paths;
+ // Load the mypaint brushes
+ const QString mypaintBrushes("/usr/share/mypaint-data/1.0/brushes");
+ paths.push_back(TFilePath(mypaintBrushes));
paths.push_back(m_libraryDir + "mypaint brushes");
QStringList genericLocations =
QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);
--
2.26.0
