[arch-commits] Commit in libmypaint/trunk (PKGBUILD gegl-0.4.patch versioning.patch)
Jan Steffens
heftig at archlinux.org
Sun May 13 14:52:25 UTC 2018
Date: Sunday, May 13, 2018 @ 14:52:25
Author: heftig
Revision: 324153
1.3.0-5
Added:
libmypaint/trunk/gegl-0.4.patch
Modified:
libmypaint/trunk/PKGBUILD (contents, properties)
libmypaint/trunk/versioning.patch
------------------+
PKGBUILD | 12 +
gegl-0.4.patch | 53 ++++++++
versioning.patch | 343 -----------------------------------------------------
3 files changed, 61 insertions(+), 347 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-05-13 14:52:07 UTC (rev 324152)
+++ PKGBUILD 2018-05-13 14:52:25 UTC (rev 324153)
@@ -1,9 +1,10 @@
+# $Id$
# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
# Contributor: twa022 <twa022 at gmail dot com>
pkgname=libmypaint
pkgver=1.3.0
-pkgrel=4
+pkgrel=5
pkgdesc='Library for making brushstrokes which is used by MyPaint and other projects, with GEGL support'
url='http://mypaint.org/'
arch=('x86_64')
@@ -11,15 +12,18 @@
depends=('glibc' 'json-c' 'gegl' 'glib2' 'json-glib' 'babl')
makedepends=('intltool' 'python' 'gobject-introspection')
source=(${pkgname}-${pkgver}.tar.gz::https://github.com/mypaint/libmypaint/archive/v${pkgver}.tar.gz
- versioning.patch)
+ versioning.patch gegl-0.4.patch)
sha256sums=('8fbdce62f66a027d8b43fa8b061f0e6ff2a3da63cbe55a82d1642e5e39da0654'
- 'd850f9b64bc037bd7ed6bbcec0a39115dd43ff896aef59daea79d8786fbb28c0')
+ '4a7812f1f70794471fb1b9a67d6fdb2885e7fe6ee26da88f0b63beec7e0c2325'
+ 'e6c2a7c2953ea01216090bbff471b406fcec781a2d65c3d174fc870fe4da64d6')
sha512sums=('98ba7a48a611014e683d8d534c73af1ed0754e1d9974d62db7efb588abdb9c01d090daaaba3847ece7ca7e5a4e83b334f2a3473a2c9b7e4a9c0680231f650202'
- '20bba36076e90fcc2fbe85ae08f60b9c80ba84c4f1e24a1ca55b0f494d95a561cd899061bdee48bcdd493fe70f84dc07ada7343128849247ce6c2635b1f97fee')
+ '918541f71a7c8aaf9fbb5873d8e3fb54c2409316ec5ed10a60b7e44c31af3360f81c8cf981dd474951103cce656943e68a7c3666d8bf9ee33a2d26ce2d6a1a64'
+ 'e7a79f1d8992022e31e5c24f36684327ec465b48a23e967e7ae290b8a7f35a95a2e3676ca2281d72e2533ae1edb643a5bf827cc7550fb7a39d6bbc14f334c713')
prepare() {
cd ${pkgname}-${pkgver}
patch -uNp2 < ../versioning.patch
+ patch -Np1 < ../gegl-0.4.patch
./autogen.sh
}
Property changes on: libmypaint/trunk/PKGBUILD
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: gegl-0.4.patch
===================================================================
--- gegl-0.4.patch (rev 0)
+++ gegl-0.4.patch 2018-05-13 14:52:25 UTC (rev 324153)
@@ -0,0 +1,53 @@
+diff -u -r libmypaint-1.3.0/configure.ac libmypaint-1.3.0-gegl/configure.ac
+--- libmypaint-1.3.0/configure.ac 2018-05-13 16:49:44.997077642 +0200
++++ libmypaint-1.3.0-gegl/configure.ac 2018-05-13 16:49:36.223744476 +0200
+@@ -45,7 +45,7 @@
+
+ ## Dependencies ##
+
+-m4_define([gegl_required_version], [0.3])
++m4_define([gegl_required_version], [0.4])
+ m4_define([introspection_required_version], [1.32.0])
+
+ AC_INIT([libmypaint],
+@@ -336,7 +336,7 @@
+ )
+
+ if eval "test x$enable_gegl = xyes"; then
+- PKG_CHECK_MODULES(GEGL, gegl-0.3 >= gegl_required_version)
++ PKG_CHECK_MODULES(GEGL, gegl-0.4 >= gegl_required_version)
+ fi
+ AM_CONDITIONAL(ENABLE_GEGL, test "x$enable_gegl" = "xyes")
+
+diff -u -r libmypaint-1.3.0/gegl/libmypaint-gegl.pc.in libmypaint-1.3.0-gegl/gegl/libmypaint-gegl.pc.in
+--- libmypaint-1.3.0/gegl/libmypaint-gegl.pc.in 2016-12-01 23:47:14.000000000 +0100
++++ libmypaint-1.3.0-gegl/gegl/libmypaint-gegl.pc.in 2018-05-13 16:50:16.620410376 +0200
+@@ -6,6 +6,6 @@
+ Name: libmypaint
+ Description: MyPaint brush engine library, with GEGL integration.
+ Version: @LIBMYPAINT_VERSION@
+-Requires: gegl-0.3 libmypaint
++Requires: gegl-0.4 libmypaint
+ Cflags: -I${includedir}/libmypaint-gegl
+ Libs: -L${libdir} -lmypaint-gegl
+diff -u -r libmypaint-1.3.0/gegl/Makefile.am libmypaint-1.3.0-gegl/gegl/Makefile.am
+--- libmypaint-1.3.0/gegl/Makefile.am 2018-05-13 16:48:53.437078622 +0200
++++ libmypaint-1.3.0-gegl/gegl/Makefile.am 2018-05-13 16:49:58.523744053 +0200
+@@ -11,7 +11,7 @@
+ INTROSPECTION_GIRS =
+ INTROSPECTION_SCANNER_ARGS = \
+ --warn-all \
+- --pkg="gegl-0.3" \
++ --pkg="gegl-0.4" \
+ --pkg="glib-2.0" \
+ --namespace="MyPaintGegl" \
+ --nsversion="$(LIBMYPAINT_MAJOR_VERSION).$(LIBMYPAINT_MINOR_VERSION)" \
+@@ -38,7 +38,7 @@
+ mypaint-gegl-surface.c
+
+ MyPaintGegl- at LIBMYPAINT_MAJOR_VERSION@. at LIBMYPAINT_MINOR_VERSION@.gir: libmypaint-gegl- at LIBMYPAINT_API_PLATFORM_VERSION@.la Makefile
+-MyPaintGegl_ at LIBMYPAINT_MAJOR_VERSION@_ at LIBMYPAINT_MINOR_VERSION@_gir_INCLUDES = GObject-2.0 MyPaint-$(LIBMYPAINT_MAJOR_VERSION).$(LIBMYPAINT_MINOR_VERSION) Gegl-0.3
++MyPaintGegl_ at LIBMYPAINT_MAJOR_VERSION@_ at LIBMYPAINT_MINOR_VERSION@_gir_INCLUDES = GObject-2.0 MyPaint-$(LIBMYPAINT_MAJOR_VERSION).$(LIBMYPAINT_MINOR_VERSION) Gegl-0.4
+ MyPaintGegl_ at LIBMYPAINT_MAJOR_VERSION@_ at LIBMYPAINT_MINOR_VERSION@_gir_CFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS) -I. -I..
+ MyPaintGegl_ at LIBMYPAINT_MAJOR_VERSION@_ at LIBMYPAINT_MINOR_VERSION@_gir_LIBS = libmypaint-gegl- at LIBMYPAINT_API_PLATFORM_VERSION@.la ../libmypaint- at LIBMYPAINT_API_PLATFORM_VERSION@.la
+ MyPaintGegl_ at LIBMYPAINT_MAJOR_VERSION@_ at LIBMYPAINT_MINOR_VERSION@_gir_FILES = $(introspection_sources)
Modified: versioning.patch
===================================================================
--- versioning.patch 2018-05-13 14:52:07 UTC (rev 324152)
+++ versioning.patch 2018-05-13 14:52:25 UTC (rev 324153)
@@ -113,349 +113,6 @@
m4macros/Makefile
Makefile
po/Makefile.in
-diff -Naur ./libmypaint-1.3.0.orig/configure.ac.orig ./libmypaint-1.3.0/configure.ac.orig
---- ./libmypaint-1.3.0.orig/configure.ac.orig 1969-12-31 19:00:00.000000000 -0500
-+++ ./libmypaint-1.3.0/configure.ac.orig 2016-12-01 17:47:14.000000000 -0500
-@@ -0,0 +1,339 @@
-+# AC_OPENMP requires autoconf >= 2.62.
-+AC_PREREQ(2.62)
-+
-+# API version: see https://github.com/mypaint/libmypaint/wiki/Versioning
-+m4_define([libmypaint_api_major], [1])
-+m4_define([libmypaint_api_minor], [3])
-+m4_define([libmypaint_api_micro], [0])
-+m4_define([libmypaint_api_prerelease], []) # may be blank
-+# The platform version is "major.minor" only.
-+# The full version is "major.minor.micro[-prerelease]".
-+
-+# ABI version see: https://autotools.io/libtool/version.html
-+# https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-+m4_define([libmypaint_abi_revision], [0]) # increment on every release
-+m4_define([libmypaint_abi_current], [0]) # inc when add/remove/change interfaces
-+m4_define([libmypaint_abi_age], [0]) # inc only if changes backward compat
-+
-+# Derivative version macros
-+m4_define([libmypaint_version],
-+ [libmypaint_api_major.libmypaint_api_minor.libmypaint_api_micro])
-+m4_define([libmypaint_version_full],
-+ [libmypaint_api_major().libmypaint_api_minor().libmypaint_api_micro()m4_bpatsubst(libmypaint_api_prerelease(), [^\(.\)], [-\1])])
-+
-+# Dependencies.
-+m4_define([gegl_required_version], [0.3])
-+m4_define([introspection_required_version], [1.32.0])
-+
-+AC_INIT([libmypaint],
-+ [libmypaint_version_full],
-+ [https://github.com/mypaint/libmypaint/issues],
-+ [libmypaint],
-+ [https://github.com/mypaint/libmypaint])
-+
-+AC_CONFIG_HEADERS([config.h])
-+AC_CONFIG_MACRO_DIR([m4macros])
-+
-+AM_INIT_AUTOMAKE([no-define dist-xz no-dist-gzip
-+ -Wall -Werror
-+ subdir-objects
-+ foreign])
-+
-+LIBMYPAINT_MAJOR_VERSION=libmypaint_api_major
-+LIBMYPAINT_MINOR_VERSION=libmypaint_api_minor
-+LIBMYPAINT_MICRO_VERSION=libmypaint_api_micro
-+LIBMYPAINT_VERSION=libmypaint_version
-+LIBMYPAINT_VERSION_FULL=libmypaint_version_full
-+LIBMYPAINT_API_PLATFORM_VERSION=libmypaint_api_major.libmypaint_api_minor
-+LIBMYPAINT_ABI_VERSION_INFO=libmypaint_abi_current:libmypaint_abi_revision:libmypaint_abi_age
-+
-+AC_SUBST(LIBMYPAINT_MAJOR_VERSION)
-+AC_SUBST(LIBMYPAINT_MINOR_VERSION)
-+AC_SUBST(LIBMYPAINT_MICRO_VERSION)
-+AC_SUBST(LIBMYPAINT_PRERELEASE_VERSION)
-+AC_SUBST(LIBMYPAINT_VERSION)
-+AC_SUBST(LIBMYPAINT_VERSION_FULL)
-+AC_SUBST(LIBMYPAINT_API_PLATFORM_VERSION)
-+AC_SUBST(LIBMYPAINT_ABI_VERSION_INFO)
-+
-+AC_PROG_CC
-+AC_PROG_CC_C99
-+AM_PROG_AR
-+
-+AC_PROG_INSTALL
-+
-+# Initialize libtool (default: shared library only).
-+LT_PREREQ([2.2])
-+LT_INIT([disable-static win32-dll])
-+
-+# Initialize maintainer mode
-+AM_MAINTAINER_MODE([enable])
-+
-+# Check for pkg-config
-+PKG_PROG_PKG_CONFIG(0.16)
-+
-+###########################
-+# Check host architecture
-+###########################
-+
-+AC_CANONICAL_HOST
-+
-+case "$host_cpu" in
-+ i*86)
-+ have_x86=yes
-+ AC_DEFINE(ARCH_X86, 1, [Define to 1 if you are compiling for ix86.])
-+ ;;
-+ x86_64)
-+ have_x86=yes
-+ AC_DEFINE(ARCH_X86, 1, [Define to 1 if you are compiling for ix86.])
-+ AC_DEFINE(ARCH_X86_64, 1, [Define to 1 if you are compiling for amd64.])
-+ ;;
-+ ppc | powerpc)
-+ have_ppc=yes
-+ AC_DEFINE(ARCH_PPC, 1, [Define to 1 if you are compiling for PowerPC.])
-+ ;;
-+ ppc64 | powerpc64)
-+ have_ppc=yes
-+ AC_DEFINE(ARCH_PPC, 1, [Define to 1 if you are compiling for PowerPC.])
-+ AC_DEFINE(ARCH_PPC64, 1, [Define to 1 if you are compiling for PowerPC64.])
-+ ;;
-+ *)
-+ ;;
-+esac
-+
-+#################
-+# Check for Win32
-+#################
-+
-+AC_MSG_CHECKING([for some Win32 platform])
-+case "$host_os" in
-+ mingw* | cygwin*)
-+ platform_win32=yes
-+ ;;
-+ *)
-+ platform_win32=no
-+ ;;
-+esac
-+AC_MSG_RESULT([$platform_win32])
-+AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")
-+
-+AC_MSG_CHECKING([for native Win32])
-+case "$host_os" in
-+ mingw*)
-+ os_win32=yes
-+ case "$host_cpu" in
-+ x86_64)
-+ ;;
-+ *)
-+ WIN32_LARGE_ADDRESS_AWARE='-Wl,--large-address-aware'
-+ ;;
-+ esac
-+ PATHSEP=';'
-+ ;;
-+ *)
-+ os_win32=no
-+ PATHSEP=':'
-+ ;;
-+esac
-+AC_MSG_RESULT([$os_win32])
-+AC_SUBST(WIN32_LARGE_ADDRESS_AWARE)
-+AC_SUBST(PATHSEP)
-+AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "yes")
-+AM_CONDITIONAL(OS_UNIX, test "$os_win32" != "yes")
-+
-+####################
-+# Check for Mac OS X
-+####################
-+
-+platform_osx=no
-+AC_MSG_CHECKING([if compiling for Mac OS X])
-+case "$host_os" in
-+ darwin*)
-+ AC_MSG_RESULT(yes)
-+ AC_DEFINE(PLATFORM_OSX, 1, [define to 1 if compiling for Mac OS X])
-+ platform_osx=yes
-+ ;;
-+ *)
-+ AC_MSG_RESULT(no)
-+ ;;
-+esac
-+
-+AM_CONDITIONAL(PLATFORM_OSX, test "x$platform_osx" = xyes)
-+
-+# Define strdup() in string.h under glibc >= 2.10 (POSIX.1-2008)
-+CFLAGS="-D_POSIX_C_SOURCE=200809L $CFLAGS"
-+
-+## Debug ##
-+AC_MSG_CHECKING([whether to turn on debugging])
-+AC_ARG_ENABLE(debug,
-+ AS_HELP_STRING([--enable-debug],
-+ [turn on debugging (default=no)])
-+)
-+
-+if eval "test x$enable_debug = xyes"; then
-+ AC_MSG_RESULT([yes])
-+ CPPDEFINES='HEAVY_DEBUG $CPPDEFINES'
-+ CCFLAGS='-O0 $CCFLAGS'
-+ LINKFLAGS='-O0 $LINKFLAGS'
-+else
-+ AC_MSG_RESULT([no])
-+ CCFLAGS='-O3 $CCFLAGS'
-+ LINKFLAGS='-O3 $LINKFLAGS'
-+fi
-+
-+## Profiling ##
-+AC_MSG_CHECKING([whether to turn on profiling])
-+AC_ARG_ENABLE(profiling,
-+ AS_HELP_STRING([--enable-profiling],
-+ [turn on profiling (default=no)])
-+)
-+
-+if eval "test x$enable_profiling = xyes"; then
-+ AC_MSG_RESULT([yes])
-+ CCFLAGS='-pg $CCFLAGS'
-+else
-+ AC_MSG_RESULT([no])
-+fi
-+
-+## Variables for pkg-config file ##
-+PKG_CONFIG_REQUIRES=""
-+
-+## OpenMP ##
-+AC_ARG_ENABLE(openmp,
-+ AS_HELP_STRING([--enable-openmp],
-+ [compile with OpenMP (default=no)]),
-+ [AC_OPENMP([CFLAGS="$CFLAGS $OPENMP_CFLAGS"])]
-+)
-+
-+AC_SUBST(OPENMP_CFLAGS)
-+
-+## gperftools ##
-+AC_ARG_ENABLE(gperftools,
-+ AS_HELP_STRING([--enable-gperftools],
-+ [enable gperftools in build, for profiling (default=no)])
-+)
-+
-+have_libprofiler="no"
-+if test "x$enable_gperftools" = xyes; then
-+ PKG_CHECK_MODULES(LIBPROFILER, libprofiler,
-+ have_libprofiler="yes")
-+fi
-+AM_CONDITIONAL(HAVE_GPERFTOOLS, test "x$have_libprofiler" = "xyes")
-+
-+## Docs ##
-+AC_ARG_ENABLE(docs,
-+ AS_HELP_STRING([--enable-docs],
-+ [enable documentation build (default=no)])
-+)
-+
-+if test "x$enable_docs" = xyes; then
-+ AC_CHECK_PROGS(DOXYGEN, doxygen)
-+ AC_CHECK_PROGS(SPHINX_BUILD, sphinx-build2 sphinx-build-2 sphinx-build3 sphinx-build-3 sphinx-build)
-+ # TODO: the python "breathe" extension is also a dependency to doc building.
-+ # The configure script should check for its existence.
-+fi
-+AM_CONDITIONAL(ENABLE_DOCS,
-+ test "x$DOXYGEN" != "x" && test "x$SPHINX_BUILD" != "x")
-+
-+## json-c ##
-+PKG_CHECK_MODULES(JSON, json-c,
-+ have_json_c="yes", have_json_c="no")
-+
-+if test "x$have_json_c" = xno; then
-+ AC_MSG_WARN([Could not find 'json-c', trying legacy 'json' instead])
-+ PKG_CHECK_MODULES(JSON, json)
-+ PKG_CONFIG_REQUIRES="json"
-+else
-+ PKG_CONFIG_REQUIRES="json-c"
-+fi
-+
-+AC_DEFINE(HAVE_JSON_C, 1, [Define to 1 if json is available])
-+AC_SUBST(JSON_LIBS)
-+AC_SUBST(JSON_CFLAGS)
-+
-+## Standard maths functions ##
-+AC_SEARCH_LIBS([floorf], [m], [], AC_MSG_ERROR([no floorf]))
-+AC_SEARCH_LIBS([powf], [m], [], AC_MSG_ERROR([no powf]))
-+AC_SEARCH_LIBS([expf], [m], [], AC_MSG_ERROR([no expf]))
-+
-+## Additional compile flags ##
-+
-+AX_CHECK_COMPILE_FLAG([-fsanitize=undefined],
-+ [test x$enable_debug = xyes && CFLAGS="-fsanitize=undefined $CFLAGS"],
-+ [], [-Werror], [])
-+AX_CHECK_LINK_FLAG([-fsanitize=undefined],
-+ [test x$enable_debug = xyes && LDFLAGS="-fsanitize=undefined $LDFLAGS"],
-+ [], [-Werror], [])
-+
-+## Internationalization ##
-+AC_ARG_ENABLE(i18n,
-+ AS_HELP_STRING([--disable-i18n],
-+ [disable internationalization (default=no)])
-+)
-+
-+if test "x$enable_i18n" != "xno"; then
-+ enable_i18n="yes"
-+ GETTEXT_PACKAGE=libmypaint
-+ AC_SUBST(GETTEXT_PACKAGE)
-+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
-+ [The prefix for our gettext translation domains.])
-+ AC_SUBST(GETTEXT_PACKAGE)
-+ IT_PROG_INTLTOOL
-+ AM_GLIB_GNU_GETTEXT
-+
-+ dnl Debian: stdlib
-+ dnl Windows, and OSX: -lintl
-+ AC_SEARCH_LIBS([dgettext], [intl], [], AC_MSG_ERROR([no dgettext]))
-+fi
-+AM_CONDITIONAL(HAVE_I18N, test "x$enable_i18n" = "xyes")
-+
-+GOBJECT_INTROSPECTION_CHECK(introspection_required_version)
-+
-+## glib ##
-+AC_ARG_WITH(glib,
-+ AS_HELP_STRING([--with-glib],
-+ [use glib (forced on by introspection)])
-+)
-+
-+if test "x$with_glib" = xyes ||
-+ test "x$found_introspection" = xyes; then
-+ PKG_CHECK_MODULES(GLIB, gobject-2.0)
-+ AC_DEFINE(MYPAINT_CONFIG_USE_GLIB, 1, [Define to 1 if glib is used])
-+ PKG_CONFIG_REQUIRES="$PKG_CONFIG_REQUIRES gobject-2.0"
-+else
-+ AC_DEFINE(MYPAINT_CONFIG_USE_GLIB, 0, [Define to 1 if glib is used])
-+fi
-+AM_CONDITIONAL(WITH_GLIB, test "x$with_glib" = "xyes")
-+
-+## GEGL ##
-+AC_ARG_ENABLE(gegl,
-+ AS_HELP_STRING([--enable-gegl],
-+ [enable GEGL based code in build (yes|no, default=no)])
-+)
-+
-+if eval "test x$enable_gegl = xyes"; then
-+ PKG_CHECK_MODULES(GEGL, gegl-0.3 >= gegl_required_version)
-+fi
-+AM_CONDITIONAL(ENABLE_GEGL, test "x$enable_gegl" = "xyes")
-+
-+# Set pkg-config variables before generation.
-+AC_SUBST(PKG_CONFIG_REQUIRES)
-+
-+AC_CONFIG_FILES([
-+ doc/Makefile
-+ gegl/libmypaint-gegl.pc:gegl/libmypaint-gegl.pc.in
-+ gegl/Makefile
-+ libmypaint.pc:libmypaint.pc.in
-+ m4macros/Makefile
-+ Makefile
-+ po/Makefile.in
-+ tests/Makefile
-+ tests/gegl/Makefile
-+])
-+
-+AC_OUTPUT
-+
-+echo ""
-+echo " Configured libmypaint $LIBMYPAINT_VERSION_FULL"
-+echo ""
-+
diff -Naur ./libmypaint-1.3.0.orig/gegl/Makefile.am ./libmypaint-1.3.0/gegl/Makefile.am
--- ./libmypaint-1.3.0.orig/gegl/Makefile.am 2016-12-01 17:47:14.000000000 -0500
+++ ./libmypaint-1.3.0/gegl/Makefile.am 2017-07-24 10:54:57.297918118 -0400
More information about the arch-commits
mailing list