new desktop file generation, workaround for module loading problems, new contributor

4 files changed, 182 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 981ab664352f..146ec791029a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = k3d-git
 	pkgdesc = A free 3D modelling and animation software
-	pkgver = r3533.c9cf45cf
-	pkgrel = 1
+	pkgver = r3544.17ef1bf0
+	pkgrel = 2
 	url = http://www.k-3d.org
 	arch = x86_64
 	arch = i686
@@ -13,24 +13,40 @@ pkgbase = k3d-git
 	makedepends = git
 	makedepends = graphviz
 	makedepends = libxslt
-	depends = cgal
-	depends = collada-dom
+	makedepends = icoutils
+	makedepends = gendesk
 	depends = ftgl
-	depends = glew
+	depends = cairomm
+	depends = dbus-glib
+	depends = freetype2
+	depends = glibmm
 	depends = gtkglext
 	depends = gtkmm
 	depends = gtksourceview2
 	depends = gts
 	depends = imagemagick
-	depends = lib3ds
-	depends = libjpeg-turbo
-	depends = ode
 	depends = openexr
+	depends = libglvnd
+	depends = glew
+	depends = zlib
+	depends = libpng
+	depends = python2
+	depends = libsigc++
+	depends = expat
+	depends = boost-libs
+	depends = graphviz
+	depends = opencollada
 	optdepends = aqsis: Rendering engine
 	provides = k3d
 	conflicts = k3d
 	source = git+https://github.com/K-3D/k3d.git
-	sha256sums = SKIP
+	source = k3d.appdata.xml
+	source = workaround.xml
+	source = https://src.fedoraproject.org/rpms/k3d/raw/master/f/0103-Use-usr-bin-python2-instead-of-usr-bin-python.patch
+	md5sums = SKIP
+	md5sums = 2018b7e8e1258aa0aa86494032b0a74a
+	md5sums = e93406cc28c4ed55c9640c09d447c53d
+	md5sums = b08d2fc3e331f732623f6188be800949
 
 pkgname = k3d-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 42711f98d5df..6999cb4b7734 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,18 @@
 # Maintainer: Thomas Ascher <thomas.ascher@gmx.at>
+# Contributor: Severin Glöckner <severin.gloeckner@stud.htwk-leipzig.de>
 # Contributor: Thomas Ascher <thomas.ascher@gmx.at>
 _pkgname=k3d
 pkgname=${_pkgname}-git
-pkgver=r3533.c9cf45cf
-pkgrel=1
+pkgver=r3544.17ef1bf0
+pkgrel=2
 pkgdesc="A free 3D modelling and animation software"
 arch=('x86_64' 'i686')
 url="http://www.k-3d.org"
 license=('GPL')
-depends=('cgal'
-         'collada-dom'
-         'ftgl'
-         'glew'
-         'gtkglext'
-         'gtkmm'
-         'gtksourceview2'
-         'gts'
-         'imagemagick'
-         'lib3ds'
-         'libjpeg-turbo'
-         'ode'
-         'openexr')
+depends=('ftgl' 'cairomm' 'dbus-glib' 'freetype2' 'glibmm' 'gtkglext' 'gtkmm'
+         'gtksourceview2' 'gts' 'imagemagick' 'openexr' 'libglvnd' 'glew' 'zlib'
+         'libpng' 'python2' 'libsigc++' 'expat' 'boost-libs' 'graphviz'
+         'opencollada')
 optdepends=('aqsis: Rendering engine')
 makedepends=('asciidoc'
              'boost'
@@ -28,32 +20,84 @@ makedepends=('asciidoc'
              'doxygen'
 	     'git'
              'graphviz'
-             'libxslt')
+             'libxslt'
+             'icoutils'
+             'gendesk')
 provides=("${_pkgname}")
 conflicts=("${_pkgname}")
-source=("git+https://github.com/K-3D/${_pkgname}.git")
-sha256sums=(SKIP)
+source=("git+https://github.com/K-3D/${_pkgname}.git"
+        "k3d.appdata.xml"
+        "workaround.xml"
+        # patches from fedora
+        "https://src.fedoraproject.org/rpms/k3d/raw/master/f/0103-Use-usr-bin-python2-instead-of-usr-bin-python.patch")
+md5sums=('SKIP'
+         '2018b7e8e1258aa0aa86494032b0a74a'
+         'e93406cc28c4ed55c9640c09d447c53d'
+         'b08d2fc3e331f732623f6188be800949')
 
 pkgver() {
   cd "${_pkgname}"
   printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
+prepare() {
+  cd "${_pkgname}"
+  patch -p1 -i "${srcdir}"/0103-Use-usr-bin-python2-instead-of-usr-bin-python.patch
+  sed -i -e "s/K3D_BOOST_COMPONENTS python)/K3D_BOOST_COMPONENTS python27)/" CMakeLists.txt
+}
+
 build() {
-  mkdir -p "${srcdir}/${_pkgname}-build"
-  cd "${srcdir}/${_pkgname}-build"
-  # for profiling add -DK3D_ENABLE_PROFILING=ON to cmake configuration and gperftools to dependencies
+  mkdir -p "${_pkgname}-build"
+  cd "${_pkgname}-build"
   cmake "${srcdir}/${_pkgname}" \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DK3D_BUILD_CARVE_MODULE=OFF \
-        -DBOOST_SYSTEM_NO_DEPRECATED=1 \
-        -DPython_ADDITIONAL_VERSIONS=2.7
+      -DCMAKE_BUILD_TYPE=Release \
+      -DCMAKE_INSTALL_PREFIX=/usr \
+      -DBoost_PYTHON_LIBRARY=/usr/lib/libboost_python27.so \
+      -DPYTHON_EXECUTABLE=/usr/bin/python2 \
+      -Wno-dev
   make
 }
 
 package() {
-  cd "${srcdir}/${_pkgname}-build"
+  # For some reason the file generation fails for this one:
+  cp "${srcdir}"/workaround.xml "${_pkgname}-build"/lib/k3d/plugins/k3d-imagemagick-io.module.proxy
+
+  cd "${_pkgname}-build"
   make DESTDIR="${pkgdir}/" install
+
+  # metadata
+  install -Dm644 "${srcdir}"/k3d.appdata.xml "${pkgdir}"/usr/share/metainfo/k3d.appdata.xml
+
+  # create launcher
+  cd "${pkgdir}"/usr/share/applications
+  gendesk -f -n \
+      --pkgname="k3d" \
+      --name="K-3D" \
+      --genericname="3D modelling and animation" \
+      --comment="view and create 3D modells and animations" \
+      --startupnotify=True \
+      --exec=k3d \
+      --categories='Graphics;3DGraphics;GTK'
+
+  # cut icons
+  for size in 22 24 32 36 64 72 96 128 192 256 384
+  do
+    case $size in
+      *)
+        mkdir -p "${pkgdir}"/usr/share/icons/hicolor/${size}x${size}/apps
+        ;;&
+    384)
+        convert -crop 384x384+10+10 \
+           "${srcdir}"/k3d/share/k3d/icons/k3d_large.png \
+           "${pkgdir}"/usr/share/icons/hicolor/384x384/apps/k3d.png
+        ;;
+      *)
+        convert -crop 377x377+13+14 -resize ${size}x${size} \
+           "${srcdir}"/k3d/share/k3d/icons/k3d_large.png \
+           "${pkgdir}"/usr/share/icons/hicolor/${size}x${size}/apps/k3d.png
+        ;;
+    esac
+  done
 }
 
 post_install() {
diff --git a/k3d.appdata.xml b/k3d.appdata.xml
new file mode 100644
index 000000000000..e569602b5258
--- /dev/null
+++ b/k3d.appdata.xml
@@ -0,0 +1,66 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2014 Richard Hughes <richard@hughsie.com> -->
+<!-- Copyright 2019 Severin Glöckner <severin.gloeckner@stud.htwk-leipzig.de> -->
+<application>
+  <id type="desktop">k3d.desktop</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-2.0-or-later</project_license>
+  <name>K-3D</name>
+  <summary>3D modelling and animation software</summary>
+  <description>
+    <p>
+     K-3D is free-as-in-freedom 3D modeling and animation software.
+     It combines flexible plugins with a visualization pipeline
+     architecture, making K-3D a versatile and powerful tool for artists.
+    </p>
+    <p>
+     K-3D's interface uses your platform's look-and-feel, and it's
+     consistent with the applications you already know.
+     New artists will find K-3D easy to understand, and professionals
+     feel right at home. K-3D is intuitive, consistent, and discoverable.
+    </p>
+  </description>
+  <screenshots>
+    <screenshot type="default">
+      <image type="source" width="950" height="741">http://www.k-3d.org/k3d_wiki/images/c/c2/Happy_buddha.png</image>
+    </screenshot>
+  </screenshots>
+  <launchable type="desktop-id">k3d.desktop</launchable>
+  <url type="homepage">http://www.k-3d.org</url>
+  <url type="donation">http://www.k-3d.org/node/4</url>
+  <url type="bugtracker">https://github.com/K-3D/k3d/issues</url>
+  <kudos>
+    <kudo>HiDpiIcon</kudo>
+  </kudos>
+  <categories>
+    <category>Graphics</category>
+    <category>3DGraphics</category>
+    <category>GTK</category>
+  </categories>
+  <provides>
+    <binary>k3d</binary>
+    <binary>k3d-renderframe</binary>
+    <binary>k3d-renderjob</binary>
+    <binary>k3d-sl2xml</binary>
+    <binary>k3d-uuidgen</binary>
+    <library>libk3d-solar-solpos.so.1</library>
+    <library>libk3dsdk-expression.so.1</library>
+    <library>libk3dsdk-half.so.1</library>
+    <library>libk3dsdk-ngui.so.1</library>
+    <library>libk3dsdk-opengl.so.1</library>
+    <library>libk3dsdk-parallel.so.1</library>
+    <library>libk3dsdk-python-arrays.so.1</library>
+    <library>libk3dsdk-python-atk.so.1</library>
+    <library>libk3dsdk-python-b.so.1</library>
+    <library>libk3dsdk-python-const-arrays.so.1</library>
+    <library>libk3dsdk-python-interfaces.so.1</library>
+    <library>libk3dsdk-python-mesh.so.1</library>
+    <library>libk3dsdk-python-primitives.so.1</library>
+    <library>libk3dsdk-python-values.so.1</library>
+    <library>libk3dsdk-python.so.1</library>
+    <library>libk3dsdk-resource.so.1</library>
+    <library>libk3dsdk-sgi-tesselator.so.1</library>
+    <library>libk3dsdk-subdivision-surface.so.1</library>
+    <library>libk3dsdk.so.1</library>
+  </provides>
+</application>
\ No newline at end of file
diff --git a/workaround.xml b/workaround.xml
new file mode 100644
index 000000000000..ebe0a53f2396
--- /dev/null
+++ b/workaround.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" ?>
+<k3dml package="k3d" version="0.8.0.7" host="Linux-4.20.12-arch1-1-ARCH;x86_64">
+	<module name="k3d-imagemagick-io.module">
+		<plugins>
+			<plugin name="ImageMagickBitmapImporter" factory_id="4eb70e35 4e654a53 a8e4b07c 4219d946" quality="stable" type="application">
+				<short_description>ImageMagick Formats ( many )</short_description>
+				<categories>
+					<category>Bitmap</category>
+					<category>BitmapImporter</category>
+				</categories>
+				<interfaces>
+					<interface>k3d::ibitmap_importer</interface>
+				</interfaces>
+				<metadata>
+					<pair name="k3d:load-order" value="128"/>
+					<pair name="k3d:mime-types" value="image/bmp image/x-sun-raster"/>
+				</metadata>
+			</plugin>
+		</plugins>
+	</module>
+</k3dml>
\ No newline at end of file