aboutsummaryrefslogtreecommitdiffstats
path: root/community/darktable
diff options
context:
space:
mode:
authorKevin Daudt <kdaudt@alpinelinux.org>2020-03-09 20:54:28 +0000
committerKevin Daudt <kdaudt@alpinelinux.org>2020-03-09 20:54:28 +0000
commitd1b434936b2dc8027c0e9dbea8b8963a81754abf (patch)
tree8b77909b8ee1bd6ef5eaed40e1a1ef3cafecad8b /community/darktable
parenteb1204d7aa01b958e7201ddb275c8e95f9e7a5cb (diff)
downloadaports-d1b434936b2dc8027c0e9dbea8b8963a81754abf.tar.bz2
aports-d1b434936b2dc8027c0e9dbea8b8963a81754abf.tar.xz
community/darktable: upgrade to 3.0.1
Diffstat (limited to 'community/darktable')
-rw-r--r--community/darktable/APKBUILD8
-rw-r--r--community/darktable/null-char-pointer-sentinel.patch39
2 files changed, 3 insertions, 44 deletions
diff --git a/community/darktable/APKBUILD b/community/darktable/APKBUILD
index f54e66456b..209cc74ee6 100644
--- a/community/darktable/APKBUILD
+++ b/community/darktable/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Kevin Daudt <kdaudt@alpinelinux.org>
# Maintainer: Kevin Daudt <kdaudt@alpinelinux.org>
pkgname=darktable
-pkgver=3.0.0
-pkgrel=3
+pkgver=3.0.1
+pkgrel=0
pkgdesc="an open source photography workflow application and raw developer"
url="https://www.darktable.org/"
arch="x86_64 aarch64"
@@ -40,7 +40,6 @@ subpackages="$pkgname-dbg $pkgname-doc $pkgname-lang"
options="!check" # Dependencies missing
source="https://github.com/darktable-org/darktable/releases/download/release-${pkgver/_/}/darktable-${pkgver/_/.}.tar.xz
fix-ifunc-multiarch.patch
- null-char-pointer-sentinel.patch
fix-cmake-none.patch
"
@@ -65,7 +64,6 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="de154cc19281f61316363243db3e531be33ac4c4632d6277ba715884b83a3c35f1d433a0e53f5f1eb7ffe03c6fcba4629612c94f942c196807c876b421faafc6 darktable-3.0.0.tar.xz
+sha512sums="a01830c5177512fb7b59f07a5ac594b486f854d41e7123faa0252caef52386ef3df4896f2c23a61b57a2b9b7bec33f3fd2f1fce6cea1388e1b74056a159e7ffa darktable-3.0.1.tar.xz
bbb665f06b21a75f34a82f26d9e7421281445843b392871d1f851c7b73eabc862bbe43525b669a67429a22fea63bb03ca90b8a1d200d62a52907946ffcd9a7e3 fix-ifunc-multiarch.patch
-5ca542c875c769c4475b0b75244365f2e5829e451e05b9294627e154de9559c995aa252f128f6ffab36c60d17a618ff562abddb88c981672960e7c35e612ebdb null-char-pointer-sentinel.patch
62e7214fb8cadd5f7d994283c684e39052ccfb020861852126dd4af8b071c406a57a08580b0d3415e1e12634b1e88af9c29da420e2f58edb57849db0d4954b29 fix-cmake-none.patch"
diff --git a/community/darktable/null-char-pointer-sentinel.patch b/community/darktable/null-char-pointer-sentinel.patch
deleted file mode 100644
index c3dd7507f1..0000000000
--- a/community/darktable/null-char-pointer-sentinel.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Fixes:
-
- error: missing sentinel in function call
-
-diff --git a/src/gui/gtk.h b/src/gui/gtk.h
-index 8c1fc23..1a0638d 100644
---- a/src/gui/gtk.h
-+++ b/src/gui/gtk.h
-@@ -334,7 +334,7 @@ static inline void dtgtk_justify_notebook_tabs(GtkNotebook *notebook)
- for(gint i = 0; i < gtk_notebook_get_n_pages(notebook); ++i)
- gtk_container_child_set(GTK_CONTAINER(notebook),
- gtk_notebook_get_nth_page(notebook, i),
-- "tab-expand", TRUE, "tab-fill", TRUE, NULL);
-+ "tab-expand", TRUE, "tab-fill", TRUE, (char*)NULL);
- }
-
- // show a dialog box with 2 buttons in case some user interaction is required BEFORE dt's gui is initialised.
-diff --git a/src/iop/lens.cc b/src/iop/lens.cc
-index 41dc792..547acf7 100644
---- a/src/iop/lens.cc
-+++ b/src/iop/lens.cc
-@@ -1256,7 +1256,7 @@ void init_global(dt_iop_module_so_t *module)
- gchar *path = g_file_get_path(g_file_get_parent(file));
- g_object_unref(file);
- #ifdef LF_MAX_DATABASE_VERSION
-- gchar *sysdbpath = g_build_filename(path, "lensfun", "version_" STR(LF_MAX_DATABASE_VERSION), NULL);
-+ gchar *sysdbpath = g_build_filename(path, "lensfun", "version_" STR(LF_MAX_DATABASE_VERSION), (char*)NULL);
- #endif
-
- #ifdef LF_0395
-@@ -1277,7 +1277,7 @@ void init_global(dt_iop_module_so_t *module)
- fprintf(stderr, "[iop_lens]: could not load lensfun database in `%s'!\n", sysdbpath);
- #endif
- g_free(dt_iop_lensfun_db->HomeDataDir);
-- dt_iop_lensfun_db->HomeDataDir = g_build_filename(path, "lensfun", NULL);
-+ dt_iop_lensfun_db->HomeDataDir = g_build_filename(path, "lensfun", (char*)NULL);
- if(dt_iop_lensfun_db->Load() != LF_NO_ERROR)
- fprintf(stderr, "[iop_lens]: could not load lensfun database in `%s'!\n", dt_iop_lensfun_db->HomeDataDir);
- #ifdef LF_MAX_DATABASE_VERSION