Ticket #35008: patch-glom-1.26.0.diff

File patch-glom-1.26.0.diff, 11.1 KB (added by dbevans (David B. Evans), 10 years ago)

Work in progress patch to update to version 1.26.0.

  • opt/macports/users/devans/GNOME-3/stable/dports/gnome/glom/Portfile

     
     1# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
    12# $Id$
    2 PortSystem 1.0
    3 name            glom
    4 version         1.4.2
    53
    6 description     Glom is an easy-to-use database designer and user interface.
    7 long_description        ${description}
    8 maintainers     landonf
    9 categories      gnome databases
    10 platforms       darwin
     4PortSystem      1.0
     5PortGroup       active_variants 1.1
    116
    12 homepage        http://www.glom.org/
    13 master_sites    gnome:sources/glom/1.4/
     7name            glom
     8version         1.26.0
     9set branch      [join [lrange [split ${version} .] 0 1] .]
     10license         GPL-2
     11description     Glom is an easy-to-use database designer and user interface.
     12long_description \
     13                ${description} This version supports GTK+ 3 and the libgda-5.0 API.
     14maintainers     landonf
     15categories      gnome databases
     16platforms       darwin
    1417
    15 checksums       md5 71c868a2e8e85e96bdbbf78608228bc8
    16 use_bzip2       yes
     18homepage        http://www.glom.org/
     19master_sites    gnome:sources/${name}/${branch}/
    1720
    18 depends_lib     port:bakery port:libgdamm port:libgnomecanvasmm \
    19                 port:gnome-session port:python24 \
    20                 port:iso-codes port:libgtksourceviewmm \
    21                 port:libiconv port:postgresql81 port:gettext \
    22                 port:gnome-python-extras
     21use_xz          yes
    2322
    24 post-patch {
    25         reinplace s/-lutil//g   ${worksrcpath}/glom/libglom/Makefile.in \
    26                                 ${worksrcpath}/glom/Makefile.in \
    27                                 ${worksrcpath}/glom/python_embed/python_module/Makefile.in
     23checksums       rmd160  3f48af233fba992dbd86a99dc276d20d631a9a82 \
     24                sha256  f53a2d46f766d4e50b1cde0edc4408b443f22db7662f47dd80f7b1a545050024
     25
     26depends_build   port:pkgconfig \
     27                port:intltool \
     28                port:itstool \
     29                port:yelp-tools \
     30                port:mm-common \
     31                port:graphviz \
     32                port:doxygen \
     33                port:libxslt \
     34                port:py27-sphinx
     35
     36depends_lib     port:desktop-file-utils \
     37                port:libarchive \
     38                port:gtkmm3 \
     39                port:boost \
     40                port:libxml2 \
     41                port:libxmlxx2 \
     42                port:libgda5 \
     43                port:libgdamm5 \
     44                port:goocanvasmm2\
     45                port:gtksourceviewmm3 \
     46                port:postgresql93 \
     47                port:py27-gobject3 \
     48                port:libepc \
     49                port:evince \
     50                port:shared-mime-info
     51
     52depends_run     port:gnome-settings-daemon \
     53                port:yelp \
     54                port:gnome-keyring
     55
     56patchfiles      patch-configure.ac.diff \
     57                patch-glom-libglom-connectionpool.cc.diff
     58
     59require_active_variants libgda5 postgresql93
     60
     61# update macros/intltool.m4 and autoreconf
     62
     63pre-configure {
     64    copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/macros
    2865}
    2966
    30 configure.cflags-append "-I${prefix}/include -L${prefix}/lib"
    31 configure.env   PYTHON_EXEC_PREFIX="${prefix}" \
    32                 PYTHON_PREFIX="${prefix}"
     67use_autoreconf  yes
     68autoreconf.args -fvi
    3369
    34 configure.args  --with-postgres-utils=${prefix}/lib/postgresql81/bin \
    35                 --disable-scrollkeeper
     70set python.branch   2.7
     71set python.prefix   ${frameworks_dir}/Python.framework/Versions/${python.branch}
    3672
    37 build.args      MSGFMT="${prefix}/bin/msgfmt" GMSGFMT="${prefix}/bin/msgfmt"
     73configure.pkg_config_path ${python.prefix}/lib/pkgconfig
     74configure.python          ${prefix}/bin/python${python.branch}
    3875
    39 post-destroot {
    40         file delete "${destpath}${prefix}/share/mime/globs"
    41         file delete "${destpath}${prefix}/share/mime/magic"
    42         file delete "${destpath}${prefix}/share/mime/XMLnamespaces"
     76configure.env   SPHINX_BUILD=${prefix}/bin/sphinx-build-${python.branch} \
     77                PYTHON_EXTRA_LDFLAGS=' '
     78
     79configure.perl  ${prefix}/bin/perl5.16
     80
     81configure.args  --with-boost-python=mt \
     82                --with-postgres-utils=${prefix}/lib/postgresql93/bin \
     83                --disable-mysql \
     84                --disable-silent-rules \
     85                --disable-update-mime-database \
     86                --disable-documentation
     87
     88universal_variant no
     89
     90post-activate {
     91    system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
     92    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
     93    system "${prefix}/bin/update-mime-database ${prefix}/share/mime"
    4394}
     95
     96livecheck.type gnome

  • opt/macports/users/devans/GNOME-3/stable/dports/gnome/glom/files/patch-configure.ac.diff

     
     1--- configure.ac.orig   2014-03-06 07:48:22.000000000 -0800
     2+++ configure.ac        2014-04-11 01:13:02.000000000 -0700
     3@@ -63,8 +63,8 @@
     4 # i18n
     5 IT_PROG_INTLTOOL([0.35])
     6 
     7-AM_GNU_GETTEXT([external])
     8-AM_GNU_GETTEXT_VERSION([0.17])
     9+#AM_GNU_GETTEXT([external])
     10+#AM_GNU_GETTEXT_VERSION([0.17])
     11 
     12 AC_SUBST([GETTEXT_PACKAGE], [glom])
     13 AC_DEFINE([GETTEXT_PACKAGE], [PACKAGE_TARNAME], [Define to the gettext package name.])
     14@@ -157,7 +157,10 @@
     15 
     16 
     17 # Libraries used by libglom:
     18-REQUIRED_LIBGLOM_LIBS='giomm-2.4 >= 2.32.0 libxml++-2.6 >= 2.23.1 libxslt >= 1.1.10 pygobject-3.0 >= 2.29.0 libgdamm-5.0 >= 4.99.6 libgda-5.0 >= 5.2.1 libgda-postgres-5.0 libgda-postgres-5.0 libgda-mysql-5.0 libarchive >= 3.0'
     19+REQUIRED_LIBGLOM_LIBS='giomm-2.4 >= 2.32.0 libxml++-2.6 >= 2.23.1 libxslt >= 1.1.10 pygobject-3.0 >= 2.29.0 libgdamm-5.0 >= 4.99.6 libgda-5.0 >= 5.2.1 libgda-postgres-5.0 libgda-postgres-5.0 libarchive >= 3.0'
     20+
     21+AS_IF([test "x$glom_enable_mysql" = xyes],
     22+      [REQUIRED_LIBGLOM_LIBS="$REQUIRED_LIBGLOM_LIBS libgda-mysql-5.0"])
     23 
     24 AS_IF([test "x$glom_host_win32" != xyes],
     25       [REQUIRED_LIBGLOM_LIBS="$REQUIRED_LIBGLOM_LIBS libepc-1.0 >= 0.4.0"])
     26@@ -224,6 +227,17 @@
     27 # so we can use pyexec_LTLIBRARIES in the .am files:
     28 AM_PATH_PYTHON
     29 
     30+dnl Override standard python locations with MacPorts version specific ones
     31+
     32+AC_SUBST([PYTHON_PREFIX], [`$PYTHON -c 'import sys; print(sys.prefix);'`])
     33+AC_SUBST([PYTHON_EXEC_PREFIX], [`$PYTHON -c 'import sys; print(sys.exec_prefix)'`])
     34+
     35+am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
     36+am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
     37+
     38+AC_SUBST([pythondir], [$am_cv_python_pythondir])
     39+AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
     40+
     41 # Get the compiler and linker flags for embedding Python.
     42 # To specify a particular python version you must set an environment variable.
     43 # For instance:

  • opt/macports/users/devans/GNOME-3/stable/dports/gnome/glom/files/patch-glom-frame_glom.cc.diff

     
     1--- glom/frame_glom.cc.orig     2013-04-16 00:35:35.000000000 -0700
     2+++ glom/frame_glom.cc  2013-04-16 00:35:55.000000000 -0700
     3@@ -1576,7 +1576,7 @@
     4   //Get the fields information from the database:
     5   DbUtils::type_vec_fields fieldsDatabase = DbUtils::get_fields_for_table_from_database(m_table_name);
     6 
     7-  Document* pDoc = dynamic_cast<const Document*>(get_document());
     8+  Document* pDoc = dynamic_cast<Document*>(get_document());
     9   if(pDoc)
     10   {
     11     bool document_must_be_updated = false;

  • opt/macports/users/devans/GNOME-3/stable/dports/gnome/glom/files/patch-glom-libglom-connectionpool.cc.diff

     
     1--- glom/libglom/connectionpool.cc.orig 2014-01-28 03:01:43.000000000 -0800
     2+++ glom/libglom/connectionpool.cc      2014-04-10 15:16:29.000000000 -0700
     3@@ -612,7 +612,7 @@
     4 // TODO: This is probably mingw specific
     5 static __p_sig_fn_t previous_sig_handler = SIG_DFL;
     6 #else
     7-static sighandler_t previous_sig_handler = SIG_DFL; /* Arbitrary default */
     8+static sig_t previous_sig_handler = SIG_DFL; /* Arbitrary default */
     9 #endif
     10 
     11 /* This is a Linux/Unix signal handler,

  • opt/macports/users/devans/GNOME-3/stable/dports/gnome/glom/files/patch-macros-ax_python_devel.m4.diff

     
     1--- macros/ax_python_devel.m4.orig      2014-04-10 15:29:03.000000000 -0700
     2+++ macros/ax_python_devel.m4   2014-04-10 15:32:54.000000000 -0700
     3@@ -289,7 +289,7 @@
     4        # save current global flags
     5        ac_save_LIBS="$LIBS"
     6        ac_save_CPPFLAGS="$CPPFLAGS"
     7-       LIBS="$ac_save_LIBS $PYTHON_LDFLAGS $PYTHON_EXTRA_LDFLAGS $PYTHON_EXTRA_LIBS"
     8+       LIBS="$ac_save_LIBS $PYTHON_LDFLAGS $PYTHON_EXTRA_LIBS"
     9        CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS"
     10        AC_LANG_PUSH([C])
     11        AC_LINK_IFELSE([

  • opt/macports/users/devans/GNOME-3/stable/dports/gnome/glom