[gnome-continuous] Untag Poppler

From: Emmanuele Bassi <ebassi src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-continuous] Untag Poppler
Date: Fri, 15 Dec 2017 16:34:30 +0000 (UTC)
commit 4d58dce614fd9f0ca9ffb809042729da11ecbb20
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Fri Dec 15 16:33:16 2017 +0000

    Untag Poppler
    
    We are building a *really* old version of Poppler.

 manifest.json                             |    9 +-
 patches/poppler-cmake-buildapi.patch      |  138 +++++++++++++++++++++++++++++
 patches/poppler-cmake-disable-nss3.patch  |   39 ++++++++
 patches/poppler-data-cmake-buildapi.patch |  118 ++++++++++++++++++++++++
 4 files changed, 300 insertions(+), 4 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index 764997f..b215e1a 100644
--- a/manifest.json
+++ b/manifest.json
@@ -512,11 +512,12 @@
                 "config-opts": ["--without-lzo2"],
                 "patches": ["libarchive-autogen.patch"]},
 
+                {"src": "fd-poppler:poppler-data",
+                 "patches": ["poppler-data-cmake-buildapi.patch"]},
+
                 {"src": "fd-poppler:poppler",
-                 "tag": "a8853b1df0a15570dff6ecc333769257bbf874c3",
-                 "tag-reason": "Build failure caused by missing nspr/prprf.h",
-                 "config-opts": ["--disable-poppler-cpp",
-                                 "--disable-utils"]},
+                 "patches": ["poppler-cmake-disable-nss3.patch",
+                             "poppler-cmake-buildapi.patch"]},
 
                {"src": "git:git://github.com/mm2/Little-CMS.git",
                 "tag": "lcms2.6"},
diff --git a/patches/poppler-cmake-buildapi.patch b/patches/poppler-cmake-buildapi.patch
new file mode 100644
index 0000000..221fe98
--- /dev/null
+++ b/patches/poppler-cmake-buildapi.patch
@@ -0,0 +1,138 @@
+From 4866124858022f31a71d0c26424702de64c3722c Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi gnome org>
+Date: Fri, 21 Nov 2014 11:12:07 +0100
+Subject: [PATCH] build: Add a "configure" script implementing the GNOME Build
+ API
+
+Original patch from: Debarshi Ray <debarshir gnome org>
+
+v2:
+  - Fix whitespace issues
+  - Add -GNinja switch
+
+v3:
+  - Generate a Makefile wrapper for Ninja
+
+v4:
+  - Add default paths
+
+See https://github.com/cgwalters/build-api
+---
+ configure | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 105 insertions(+)
+ create mode 100755 configure
+
+diff --git a/configure b/configure
+new file mode 100755
+index 00000000..23b33aa3
+--- /dev/null
++++ b/configure
+@@ -0,0 +1,105 @@
++#!/bin/bash
++# configure script adapter for cmake
++# Copyright 2010, 2011, 2013 Colin Walters <walters verbum org>
++# Copyright 2014 Debarshi Ray <debarshir gnome org>
++# Copyright 2017 Emmanuele Bassi <ebassi gnome org>
++# Licensed under the new-BSD license (http://www.opensource.org/licenses/bsd-license.php)
++
++prefix=/usr
++
++# Little helper function for reading args from the commandline.
++# it automatically handles -a b and -a=b variants, and returns 1 if
++# we need to shift $3.
++read_arg() {
++    # $1 = arg name
++    # $2 = arg value
++    # $3 = arg parameter
++    local rematch='^[^=]*=(.*)$'
++    if [[ $2 =~ $rematch ]]; then
++        read "$1" <<< "${BASH_REMATCH[1]}"
++    else
++        read "$1" <<< "$3"
++        # There is no way to shift our callers args, so
++        # return 1 to indicate they should do it instead.
++        return 1
++    fi
++}
++
++sanitycheck() {
++    # $1 = arg name
++    # $1 = arg command
++    # $2 = arg alternates
++    local cmd=$( which $2 2>/dev/null )
++    if [ -x "$cmd" ]; then
++        read "$1" <<< "$cmd"
++        return 0
++    fi
++    test -z $3 || {
++        for alt in $3; do
++            cmd=$( which $alt 2>/dev/null )
++            if [ -x "$cmd" ]; then
++                read "$1" <<< "$cmd"
++                return 0
++            fi
++        done
++    }
++    echo -e "\e[1;31mERROR\e[0m: Command '$2' not found"
++    exit 1
++}
++
++sanitycheck NINJA 'ninja' 'ninja-build'
++
++while (($# > 0)); do
++    case "${1%%=*}" in
++        --prefix) read_arg prefix "$@" || shift;;
++        --bindir) read_arg bindir "$@" || shift;;
++        --sbindir) read_arg sbindir "$@" || shift;;
++        --libexecdir) read_arg libexecdir "$@" || shift;;
++        --datarootdir) read_arg datarootdir "$@" || shift;;
++        --datadir) read_arg datadir "$@" || shift;;
++        --sysconfdir) read_arg sysconfdir "$@" || shift;;
++        --libdir) read_arg libdir "$@" || shift;;
++        --mandir) read_arg mandir "$@" || shift;;
++        *) echo "Ignoring unknown option '$1'";;
++    esac
++    shift
++done
++
++test -z ${prefix} && prefix=/usr
++test -z ${libdir} && libdir=${prefix}/lib
++test -z ${datarootdir} && datarootdir=${prefix}/share
++test -z ${datadir} && datadir=${datarootdir}
++test -z ${libexecdir} && libexecdir=${prefix}/libexec
++test -z ${sysconfdir} && sysconfdir=${prefix}/etc
++test -z ${mandir} && mandir=${datadir}/man
++test -z ${bindir} && bindir=${prefix}/bin
++test -z ${sbindir} && sbindir=${prefix}/sbin
++
++srcdir=$(dirname $0)
++
++cat > Makefile <<END
++# Generated by configure; do not edit
++
++all:
++      ${NINJA}
++
++install:
++      DESTDIR="\$(DESTDIR)" ${NINJA} install
++END
++
++exec cmake \
++     -DCMAKE_BUILD_TYPE=Release \
++     -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \
++     -DCMAKE_INSTALL_LIBDIR:PATH=${libdir} \
++     -DCMAKE_INSTALL_BINDIR:PATH=${bindir} \
++     -DCMAKE_INSTALL_DATADIR:PATH=${datadir} \
++     -DCMAKE_INSTALL_LIBEXECDIR:PATH=${libexecdir} \
++     -DCMAKE_INSTALL_SYSCONFDIR:PATH=${sysconfdir} \
++     -DCMAKE_INSTALL_MANDIR:PATH=${mandir} \
++     -DENABLE_GTK_DOC=OFF \
++     -DENABLE_UTILS=OFF \
++     -DENABLE_CPP=OFF \
++     -DENABLE_QT5=OFF \
++     -DENABLE_NSS3=OFF \
++     -GNinja \
++     ${srcdir}
+-- 
+2.14.3
+
diff --git a/patches/poppler-cmake-disable-nss3.patch b/patches/poppler-cmake-disable-nss3.patch
new file mode 100644
index 0000000..51b4c7f
--- /dev/null
+++ b/patches/poppler-cmake-disable-nss3.patch
@@ -0,0 +1,39 @@
+From 1056fe8d39af4e6f06ee3e583357711abdcfd907 Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi gnome org>
+Date: Fri, 15 Dec 2017 16:24:23 +0000
+Subject: [PATCH 1/2] build: Allow disabling NSS3 support
+
+NSS3 is currently broken, but it's not possible to disable it if you
+have the misfortune of having the nss3 headers installed.
+
+Signed-off-by: Emmanuele Bassi <ebassi gnome org>
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d8072a93..3f6cba61 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -54,6 +54,7 @@ set(ENABLE_DCTDECODER "libjpeg" CACHE STRING "Use libjpeg for DCT streams. Possi
+ option(ENABLE_LIBCURL "Build libcurl based HTTP support." ON)
+ option(ENABLE_ZLIB "Build with zlib." ON)
+ option(ENABLE_ZLIB_UNCOMPRESS "Use zlib to uncompress flate streams (not totally safe)." OFF)
++option(ENABLE_NSS3 "Build with nss3." ON)
+ option(SPLASH_CMYK "Include support for CMYK rasterization." OFF)
+ option(USE_FIXEDPOINT "Use fixed point arithmetic in the Splash backend" OFF)
+ option(USE_FLOAT "Use single precision arithmetic in the Splash backend" OFF)
+@@ -253,9 +254,8 @@ if(ENABLE_ZLIB)
+   include_directories(${ZLIB_INCLUDE_DIR})
+ endif()
+ 
+-if (NSS3_FOUND)
++if (ENABLE_NSS3 AND NSS3_FOUND)
+   add_definitions(${NSS3_CFLAGS})
+-  set(ENABLE_NSS3 ON)
+ endif()
+ if(JPEG_FOUND)
+   include_directories(${JPEG_INCLUDE_DIR})
+-- 
+2.14.3
+
diff --git a/patches/poppler-data-cmake-buildapi.patch b/patches/poppler-data-cmake-buildapi.patch
new file mode 100644
index 0000000..b23b0b6
--- /dev/null
+++ b/patches/poppler-data-cmake-buildapi.patch
@@ -0,0 +1,118 @@
+From 14125281b11cbf03ac1667c0fc24b9f8d05a631d Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi gnome org>
+Date: Fri, 21 Nov 2014 11:12:07 +0100
+Subject: [PATCH] build: Add a "configure" script implementing the GNOME Build
+ API
+
+Original patch from: Debarshi Ray <debarshir gnome org>
+
+v2:
+  - Fix whitespace issues
+  - Add -GNinja switch
+
+v3:
+  - Generate a Makefile wrapper for Ninja
+
+See https://github.com/cgwalters/build-api
+---
+ configure | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 88 insertions(+)
+ create mode 100755 configure
+
+diff --git a/configure b/configure
+new file mode 100755
+index 0000000..3cdd374
+--- /dev/null
++++ b/configure
+@@ -0,0 +1,88 @@
++#!/bin/bash
++# configure script adapter for cmake
++# Copyright 2010, 2011, 2013 Colin Walters <walters verbum org>
++# Copyright 2014 Debarshi Ray <debarshir gnome org>
++# Copyright 2017 Emmanuele Bassi <ebassi gnome org>
++# Licensed under the new-BSD license (http://www.opensource.org/licenses/bsd-license.php)
++
++prefix=/usr
++
++# Little helper function for reading args from the commandline.
++# it automatically handles -a b and -a=b variants, and returns 1 if
++# we need to shift $3.
++read_arg() {
++    # $1 = arg name
++    # $2 = arg value
++    # $3 = arg parameter
++    local rematch='^[^=]*=(.*)$'
++    if [[ $2 =~ $rematch ]]; then
++        read "$1" <<< "${BASH_REMATCH[1]}"
++    else
++        read "$1" <<< "$3"
++        # There is no way to shift our callers args, so
++        # return 1 to indicate they should do it instead.
++        return 1
++    fi
++}
++
++sanitycheck() {
++    # $1 = arg name
++    # $1 = arg command
++    # $2 = arg alternates
++    local cmd=$( which $2 2>/dev/null )
++    if [ -x "$cmd" ]; then
++        read "$1" <<< "$cmd"
++        return 0
++    fi
++    test -z $3 || {
++        for alt in $3; do
++            cmd=$( which $alt 2>/dev/null )
++            if [ -x "$cmd" ]; then
++                read "$1" <<< "$cmd"
++                return 0
++            fi
++        done
++    }
++    echo -e "\e[1;31mERROR\e[0m: Command '$2' not found"
++    exit 1
++}
++
++sanitycheck NINJA 'ninja' 'ninja-build'
++
++while (($# > 0)); do
++    case "${1%%=*}" in
++        --prefix) read_arg prefix "$@" || shift;;
++        --bindir) read_arg bindir "$@" || shift;;
++        --sbindir) read_arg sbindir "$@" || shift;;
++        --libexecdir) read_arg libexecdir "$@" || shift;;
++        --datarootdir) read_arg datarootdir "$@" || shift;;
++        --datadir) read_arg datadir "$@" || shift;;
++        --sysconfdir) read_arg sysconfdir "$@" || shift;;
++        --libdir) read_arg libdir "$@" || shift;;
++        --mandir) read_arg mandir "$@" || shift;;
++        *) echo "Ignoring unknown option '$1'";;
++    esac
++    shift
++done
++
++srcdir=$(dirname $0)
++
++unset CFLAGS
++unset CXXFLAGS
++
++cat > Makefile <<END
++# Generated by configure; do not edit
++
++all:
++      ${NINJA}
++
++install:
++      DESTDIR="\$(DESTDIR)" ${NINJA} install
++END
++
++exec cmake \
++     -DPORT=GTK \
++     -DCMAKE_BUILD_TYPE=Release \
++     -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \
++     -GNinja \
++     ${srcdir}
+-- 
+2.14.3
+
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]