summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Timo Gurr <tgurr@exherbo.org> 2020-05-12 17:22:37 +0200
committerAvatar Timo Gurr <tgurr@exherbo.org> 2020-05-13 09:51:21 +0000
commitafdf6acb312fd026fc60361622f20725ce911a97 (patch)
tree132b43ab298ff5c81083746c328345e3d2058461
parent39e5548d67ba2bbf476641e4c03d08549d45c9d6 (diff)
downloadmedia-afdf6acb312fd026fc60361622f20725ce911a97.tar.gz
media-afdf6acb312fd026fc60361622f20725ce911a97.tar.xz
inkscape: version bump to 1.0
Move to release tarball as it includes the extensions.
-rw-r--r--packages/media-gfx/inkscape/files/inkscape-0.92.2-Use-CMAKE-INSTALL-DATAROOTDIR-part1.patch74
-rw-r--r--packages/media-gfx/inkscape/files/inkscape-0.92.2-Use-CMAKE-INSTALL-DATAROOTDIR-part2.patch21
-rw-r--r--packages/media-gfx/inkscape/inkscape-1.0.exheres-0 (renamed from packages/media-gfx/inkscape/inkscape-0.92.5.exheres-0)87
3 files changed, 52 insertions, 130 deletions
diff --git a/packages/media-gfx/inkscape/files/inkscape-0.92.2-Use-CMAKE-INSTALL-DATAROOTDIR-part1.patch b/packages/media-gfx/inkscape/files/inkscape-0.92.2-Use-CMAKE-INSTALL-DATAROOTDIR-part1.patch
deleted file mode 100644
index 88045b70..00000000
--- a/packages/media-gfx/inkscape/files/inkscape-0.92.2-Use-CMAKE-INSTALL-DATAROOTDIR-part1.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-Source: Timo Gurr <tgurr@exherbo.org>
-Upstream: No
-Reason: Use CMAKE_INSTALL_DATAROOTDIR
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 35628f4261..7c5e1b60d4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -10,6 +10,9 @@ message("------------------------------")
- message("Source Dir: ${CMAKE_CURRENT_SOURCE_DIR}")
- message("Binary Dir: ${CMAKE_CURRENT_BINARY_DIR}")
-
-+# Use GNUInstallDirs to get canonical paths
-+include(GNUInstallDirs)
-+
- # -----------------------------------------------------------------------------
- # CMake Configuration
- # -----------------------------------------------------------------------------
-diff --git a/CMakeScripts/ConfigPaths.cmake b/CMakeScripts/ConfigPaths.cmake
-index 89afc651fe..338bbcbcb3 100644
---- a/CMakeScripts/ConfigPaths.cmake
-+++ b/CMakeScripts/ConfigPaths.cmake
-@@ -17,17 +17,17 @@ if(WIN32)
- mark_as_advanced(SHARE_INSTALL)
- else()
- set(INKSCAPE_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib")
-- set(INKSCAPE_DATADIR "${CMAKE_INSTALL_PREFIX}/share")
-+ set(INKSCAPE_DATADIR "${CMAKE_INSTALL_DATAROOTDIR}")
-
- # TODO: check and change this to correct value:
- if(NOT PACKAGE_LOCALE_DIR)
-- set(PACKAGE_LOCALE_DIR "${CMAKE_INSTALL_PREFIX}/share/locale") # packagers might overwrite this
-+ set(PACKAGE_LOCALE_DIR "${CMAKE_INSTALL_DATAROOTDIR}/locale") # packagers might overwrite this
- endif(NOT PACKAGE_LOCALE_DIR)
-
- if(NOT SHARE_INSTALL)
- set(SHARE_INSTALL "share" CACHE STRING "Data file install path. Must be a relative path (from CMAKE_INSTALL_PREFIX), with no trailing slash.")
- endif(NOT SHARE_INSTALL)
-- set(INKSCAPE_SHARE_INSTALL "${SHARE_INSTALL}/inkscape")
-+ set(INKSCAPE_SHARE_INSTALL "${CMAKE_INSTALL_DATAROOTDIR}/inkscape")
-
- mark_as_advanced(SHARE_INSTALL)
--endif()
-\ No newline at end of file
-+endif()
-diff --git a/CMakeScripts/Pod2man.cmake b/CMakeScripts/Pod2man.cmake
-index 3189192dea..295a34541d 100644
---- a/CMakeScripts/Pod2man.cmake
-+++ b/CMakeScripts/Pod2man.cmake
-@@ -48,7 +48,7 @@ macro(pod2man PODFILE_FULL RELEASE SECTION CENTER)
- )
- install(
- FILES ${MANFILE_FULL}
-- DESTINATION ${CMAKE_INSTALL_PREFIX}/${SHARE_INSTALL}/man/man${SECTION}
-+ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/man/man${SECTION}
- )
- endif()
- endmacro(pod2man PODFILE NAME SECTION CENTER)
-diff --git a/share/icons/application/CMakeLists.txt b/share/icons/application/CMakeLists.txt
-index f93b4068ee..d8c67195d4 100644
---- a/share/icons/application/CMakeLists.txt
-+++ b/share/icons/application/CMakeLists.txt
-@@ -2,8 +2,8 @@ set(PIXMAP_SIZES "16x16" "22x22" "24x24" "32x32" "48x48" "256x256")
- set(THEME hicolor)
- foreach(pixmap_size ${PIXMAP_SIZES})
- FILE(GLOB PIXMAP_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${pixmap_size}/*.png ${CMAKE_CURRENT_SOURCE_DIR}/${pixmap_size}/*.svg)
-- install(FILES ${PIXMAP_FILES} DESTINATION ${SHARE_INSTALL}/icons/${THEME}/${pixmap_size}/apps)
-+ install(FILES ${PIXMAP_FILES} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/${THEME}/${pixmap_size}/apps)
- endforeach(pixmap_size)
-
- # I hope that this is actually run after installing the files.
--install(CODE "execute_process(COMMAND gtk-update-icon-cache -f -t ${CMAKE_INSTALL_PREFIX}/${SHARE_INSTALL}/icons/${THEME})")
-\ No newline at end of file
-+install(CODE "execute_process(COMMAND gtk-update-icon-cache -f -t ${CMAKE_INSTALL_DATAROOTDIR}/icons/${THEME})")
diff --git a/packages/media-gfx/inkscape/files/inkscape-0.92.2-Use-CMAKE-INSTALL-DATAROOTDIR-part2.patch b/packages/media-gfx/inkscape/files/inkscape-0.92.2-Use-CMAKE-INSTALL-DATAROOTDIR-part2.patch
deleted file mode 100644
index 5d2461b0..00000000
--- a/packages/media-gfx/inkscape/files/inkscape-0.92.2-Use-CMAKE-INSTALL-DATAROOTDIR-part2.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Source: Timo Gurr <tgurr@exherbo.org>
-Upstream: No
-Reason: Use CMAKE_INSTALL_DATAROOTDIR
-
-diff --git a/CMakeScripts/Install.cmake b/CMakeScripts/Install.cmake
-index 726db175e0..192f21c3a1 100644
---- a/CMakeScripts/Install.cmake
-+++ b/CMakeScripts/Install.cmake
-@@ -2,10 +2,10 @@ if(UNIX)
- #The install directive for the binaries and libraries are found in src/CMakeList.txt
- install(FILES
- ${CMAKE_BINARY_DIR}/inkscape.desktop
-- DESTINATION ${CMAKE_INSTALL_PREFIX}/${SHARE_INSTALL}/applications)
-+ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
- install(FILES
- ${CMAKE_BINARY_DIR}/inkscape.appdata.xml
-- DESTINATION ${CMAKE_INSTALL_PREFIX}/${SHARE_INSTALL}/metainfo)
-+ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo)
- endif()
-
- if(WIN32)
diff --git a/packages/media-gfx/inkscape/inkscape-0.92.5.exheres-0 b/packages/media-gfx/inkscape/inkscape-1.0.exheres-0
index d2fd88f4..1fce8b36 100644
--- a/packages/media-gfx/inkscape/inkscape-0.92.5.exheres-0
+++ b/packages/media-gfx/inkscape/inkscape-1.0.exheres-0
@@ -2,9 +2,9 @@
# Copyright 2009 Michael Forney <michael@obberon.com>
# Distributed under the terms of the GNU General Public License v2
-MY_PV=${PN^^}_${PV//./_}
+DOWNLOAD_ID="18460"
+TARBALL_REV="2020-05-01_4035a4fb49"
-require gitlab [ new_download_scheme=true tag=${MY_PV} suffix=tar.bz2 ]
require cmake
require freedesktop-desktop gtk-icon-cache
@@ -17,9 +17,10 @@ Graphics (SVG) file format. Inkscape supports many advanced SVG features
streamlined interface. It is very easy to edit nodes, perform complex path
operations, trace bitmaps and much more.
"
-HOMEPAGE+=" https://inkscape.org"
+HOMEPAGE="https://inkscape.org"
+DOWNLOADS="${HOMEPAGE}/gallery/item/${DOWNLOAD_ID}/${PNV}.tar.xz"
-UPSTREAM_RELEASE_NOTES="http://wiki.inkscape.org/wiki/index.php/Release_notes/${PV}"
+UPSTREAM_RELEASE_NOTES="https://wiki.inkscape.org/wiki/index.php/Release_notes/${PV}"
LICENCES="GPL-2 GPL-3 LGPL-2.1"
SLOT="0"
@@ -27,7 +28,6 @@ PLATFORMS="~amd64 ~x86"
MYOPTIONS="
cdr [[ description = [ Enable support for importing CorelDraw files ] ]]
dia [[ description = [ Enable support for importing Dia files ] ]]
- gnome [[ description = [ Use gnome-vfs for file loading ] ]]
lcms [[ description = [ Enable LittleCMS for color management ] ]]
openmp [[ description = [ Support for Open Multi-Processing ] ]]
pdf [[ description = [ Enable PDF previews using poppler ] ]]
@@ -41,44 +41,47 @@ MYOPTIONS="
( providers: ijg-jpeg jpeg-turbo ) [[ number-selected = exactly-one ]]
"
-# Tests fail to run (last checked: 0.92.2)
+# TODO: Some tests fail to run (last checked: 1.0)
+# 89% tests passed, 17 tests failed out of 160
RESTRICT="test"
DEPENDENCIES="
build:
dev-lang/perl:*[>=5.8.1]
- dev-util/intltool
sys-devel/gettext[>=0.19]
virtual/pkg-config
build+run:
- app-spell/aspell [[ note = [ Automagic dep ] ]]
- app-spell/gtkspell:2 [[ note = [ Automagic dep ] ]]
+ app-spell/aspell
+ app-spell/gtkspell:3.0
dev-cpp/cairomm:1.0[>=1.9.8]
dev-cpp/libsigc++:2[>=2.0.12]
- dev-libs/atk [[ note = [ Automagic dep ] ]]
+ dev-libs/atk [[ note = [ Automagic dep ] ]]
dev-libs/boehm-gc[>=7.1]
dev-libs/boost[>=1.36]
+ dev-libs/dbus-glib:1
+ dev-libs/double-conversion:=
dev-libs/glib:2[>=2.28]
dev-libs/libxml2:2.0[>=2.6.11]
dev-libs/libxslt[>=1.0.15]
- dev-libs/popt
- gnome-bindings/atkmm:1.6
- gnome-bindings/glibmm:2.4[>=2.32][-disable-deprecated]
- gnome-bindings/gtkmm:2.4[>=2.10.0]
- gnome-bindings/pangomm:1.4
+ gnome-bindings/atkmm:1.6 [[ note = [ Automagic dep ] ]]
+ gnome-bindings/glibmm:2.4 [[ note = [ Automagic dep ] ]]
+ gnome-bindings/gtkmm:3[>=3.22]
+ gnome-bindings/pangomm:1.4 [[ note = [ Automagic dep ] ]]
+ gnome-desktop/gdl:3.0[>=3.6]
+ gnome-desktop/libsoup:2.4[>=2.42]
+ media-gfx/potrace[>=1.16] [[ note = [ require 1.16 for libraries ] ]]
media-libs/fontconfig
media-libs/freetype:2
- media-libs/libexif [[ note = [ Automagic dep ] ]]
+ media-libs/libexif [[ note = [ Automagic dep ] ]]
media-libs/libpng:=[>=1.2]
- sci-libs/gsl [[ note = [ Automagic dep ] ]]
- sys-libs/zlib [[ note = [ Automagic dep ] ]]
- x11-libs/cairo[>=1.10] [[ note = [ Automagic dep ] ]]
+ sci-libs/gsl
+ sys-libs/zlib [[ note = [ Automagic dep ] ]]
+ x11-libs/cairo[>=1.10] [[ note = [ Automagic dep ] ]]
x11-libs/gdk-pixbuf:2.0
- x11-libs/gtk+:2[>=2.24]
- x11-libs/libX11 [[ note = [ Automagic dep ] ]]
- x11-libs/libXft
- x11-libs/pango[>=1.24] [[ note = [ Automagic dep ] ]]
- gnome? ( gnome-platform/gnome-vfs[>=2.0] )
+ x11-libs/gtk+:3[>=3.22]
+ x11-libs/harfbuzz
+ x11-libs/libX11 [[ note = [ Automagic dep ] ]]
+ x11-libs/pango[>=1.41.1] [[ note = [ support for variable fonts ] ]]
cdr? (
media-libs/libcdr[>=0.03]
office-libs/librevenge
@@ -107,20 +110,19 @@ DEPENDENCIES="
dev-python/lxml [[ description = [ Required for using some of the templates ] ]]
"
-CMAKE_SOURCE="${WORKBASE}"/${PN}-${MY_PV}
-
-DEFAULT_SRC_PREPARE_PATCHES=(
- "${FILES}"/${PN}-0.92.2-Use-CMAKE-INSTALL-DATAROOTDIR-part1.patch
- "${FILES}"/${PN}-0.92.2-Use-CMAKE-INSTALL-DATAROOTDIR-part2.patch
-)
+CMAKE_SOURCE="${WORKBASE}"/${PNV}_${TARBALL_REV}
CMAKE_SRC_CONFIGURE_PARAMS=(
- -DCMAKE_DISABLE_FIND_PACKAGE_Potrace:BOOL=TRUE
+ -DBUILD_SHARED_LIBS:BOOL=TRUE
-DPACKAGE_LOCALE_DIR:PATH=/usr/share/locale
-DENABLE_BINRELOC:BOOL=FALSE
+ -DINKSCAPE_DATADIR:PATH=/usr/share
+ -DINKSCAPE_SHARE_INSTALL:PATH=/usr/share
+ -DLPE_ENABLE_TEST_EFFECTS:BOOL=FALSE
+ -DSHARE_INSTALL:PATH=/usr/share
+ -DWITH_ASAN:BOOL=FALSE
-DWITH_DBUS:BOOL=TRUE
- -DWITH_IMAGE_MAGICK:BOOL=TRUE
- -DWITH_GTK3_EXPERIMENTAL:BOOL=FALSE
+ -DWITH_JEMALLOC:BOOL=FALSE
-DWITH_LPETOOL:BOOL=FALSE
-DWITH_NLS:BOOL=TRUE
-DWITH_PROFILING:BOOL=FALSE
@@ -133,18 +135,33 @@ CMAKE_SRC_CONFIGURE_OPTION_ENABLES=(
)
CMAKE_SRC_CONFIGURE_OPTION_WITHS=(
'cdr LIBCDR'
- 'gnome GNOME_VFS'
'openmp OPENMP'
+ 'providers:graphicsmagick GRAPHICS_MAGICK'
+ 'providers:imagemagick IMAGE_MAGICK'
'visio LIBVISIO'
'wpg LIBWPG'
)
CMAKE_SRC_CONFIGURE_TESTS=(
- '-DCMAKE_DISABLE_FIND_PACKAGE_GTest:BOOL=FALSE -DCMAKE_DISABLE_FIND_PACKAGE_GTest:BOOL=TRUE'
+ '-DBUILD_TESTING:BOOL=TRUE -DBUILD_TESTING:BOOL=FALSE'
)
DEFAULT_SRC_INSTALL_EXTRA_DOCS=( TRANSLATORS )
+src_prepare() {
+ cmake_src_prepare
+
+ # fix locale search path
+ edo sed \
+ -e 's:${CMAKE_INSTALL_PREFIX}/${PACKAGE_LOCALE_DIR}:${PACKAGE_LOCALE_DIR}:g' \
+ -i config.h.cmake
+
+ # fix data search path (INKSCAPE_DATADIR)
+ edo sed \
+ -e 's:${CMAKE_INSTALL_PREFIX}:/usr:g' \
+ -i CMakeScripts/ConfigPaths.cmake
+}
+
pkg_postinst() {
freedesktop-desktop_pkg_postinst
gtk-icon-cache_pkg_postinst