[136820] trunk/dports/devel/girara

pixilla at macports.org pixilla at macports.org
Wed May 27 14:05:53 PDT 2015


Revision: 136820
          https://trac.macports.org/changeset/136820
Author:   pixilla at macports.org
Date:     2015-05-27 14:05:53 -0700 (Wed, 27 May 2015)
Log Message:
-----------
devel/girara:
- Update to version 0.2.4. Maintainer patch. Closes #47853

Modified Paths:
--------------
    trunk/dports/devel/girara/Portfile
    trunk/dports/devel/girara/files/patch-Makefile.diff

Added Paths:
-----------
    trunk/dports/devel/girara/files/patch-getline.diff

Modified: trunk/dports/devel/girara/Portfile
===================================================================
--- trunk/dports/devel/girara/Portfile	2015-05-27 20:07:07 UTC (rev 136819)
+++ trunk/dports/devel/girara/Portfile	2015-05-27 21:05:53 UTC (rev 136820)
@@ -3,14 +3,15 @@
 
 PortSystem          1.0
 
-PortGroup           active_variants 1.1
+# Unneeded PortGroup
 
 name                girara
-version             0.2.0
+version             0.2.4
 categories          devel gnome
 platforms           darwin
 license             zlib
-maintainers         gmail.com:starkhalo openmaintainer
+maintainers         gmail.com:starkhalo \
+                    openmaintainer
 description         Cross-platform widget toolkit based on GTK+
 long_description \
     girara is a library that implements a user interface that focuses on    \
@@ -26,27 +27,31 @@
 
 master_sites        ${homepage}download/
 
-checksums           rmd160 e89c075c353548740ab9e3de1d8e6ccea61823f6 \
-                    sha256 d14b54cb04d81ba3b84ad41c5e68951d250b455d0862add1c987e3af9e2e174d
+checksums           rmd160  7de0789050c7b624f18f828ca25c46f4a7d2e5c0 \
+                    sha256  2ee04e4c0e700d455ebaf92f804355f948754e7d3751d409db6595419e6ece5e
 
-patchfiles          patch-Makefile.diff \
-                    patch-config.mk.diff
+patchfiles          patch-Makefile.diff
 
 # https://trac.macports.org/ticket/43794
 # Due to #43794 "error: #pragma GCC diagnostic not allowed inside functions"
 # port needs patching to build on GCC < 4.6
 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52116
 # https://bugs.freedesktop.org/show_bug.cgi?id=52614
-patchfiles-append   patch-session.c.diff
+# patchfiles-append   patch-session.c.diff
+# Patchfile removed: Fixed upstream
 
 depends_build       port:pkgconfig
 
 depends_lib         path:lib/libglib-2.0.dylib:glib2 \
                     port:gtk3 \
-                    port:intltool
+                    port:intltool \
+                    port:libnotify \
+                    port:json-c
 
-require_active_variants \
-                    gtk3 x11 quartz
+# Removed: Port does not require `gdkx.h' but `gdkkeysyms.h'
+# and it's provided by +quartz, see 43564#comment:7
+# require_active_variants \
+#                     gtk3 x11 quartz
 
 use_configure       no
 
@@ -61,10 +66,7 @@
 # http://www.opensource.apple.com/source/cvs/cvs-47/cvs/lib/getline.h?txt
 # http://www.opensource.apple.com/source/cvs/cvs-47/cvs/lib/getdelim.c?txt
 # http://www.opensource.apple.com/source/cvs/cvs-47/cvs/lib/getdelim.h?txt
-        patchfiles-append   patch-getline.h.diff \
-                            patch-getline.c.diff \
-                            patch-getdelim.h.diff \
-                            patch-getdelim.c.diff
+        patchfiles-append   patch-getline.diff
     }
 }
 

Modified: trunk/dports/devel/girara/files/patch-Makefile.diff
===================================================================
--- trunk/dports/devel/girara/files/patch-Makefile.diff	2015-05-27 20:07:07 UTC (rev 136819)
+++ trunk/dports/devel/girara/files/patch-Makefile.diff	2015-05-27 21:05:53 UTC (rev 136820)
@@ -1,52 +1,91 @@
---- Makefile	2014-02-17 08:50:37.000000000 -0600
-+++ /Users/harciga/dev/girara/Makefile	2014-05-03 20:40:22.000000000 -0500
-@@ -67,14 +67,14 @@
+--- Makefile.orig	2015-05-26 13:57:59.000000000 -0500
++++ Makefile	2015-05-26 17:42:09.000000000 -0500
+@@ -41,6 +41,7 @@
+ ifeq ($(UNAME), Darwin)
+ SONAME_FLAG = -install_name
+ SHARED_FLAG = -dynamiclib
++OSX_FLAGS = -current_version ${SOVERSION} -compatibility_version ${SOMAJOR}
+ endif
  
- lib${PROJECT}.so.${SOVERSION}: ${OBJECTS}
- 	$(ECHO) LD $@
--	$(QUIET)${CC} -Wl,-soname,lib${PROJECT}.so.${SOMAJOR} -shared ${LDFLAGS} -o $@ ${OBJECTS} ${LIBS}
-+	$(QUIET)${CC} -Wl,-dylib_install_name,${LIBDIR}/lib${PROJECT}.${SOMAJOR}.dylib -dynamiclib -current_version ${SOVERSION} -compatibility_version ${SOMAJOR} ${LDFLAGS} -o lib${PROJECT}.${SOVERSION}.dylib ${OBJECTS} ${LIBS}
+ all: ${PROJECTNV} ${BUILDDIR}/${PROJECT}.pc po
+@@ -111,16 +112,16 @@
+ 	@mkdir -p ${BUILDDIR_RELEASE}/${BINDIR}
+ 	$(QUIET)ar rcs $@ ${OBJECTS}
  
- clean:
- 	$(QUIET)rm -rf ${OBJECTS} ${PROJECT}-${VERSION}.tar.gz \
- 		${DOBJECTS} lib${PROJECT}.a lib${PROJECT}-debug.a ${PROJECT}.pc doc \
- 		lib$(PROJECT).so.${SOVERSION} lib${PROJECT}-debug.so.${SOVERSION} .depend \
- 		${PROJECTNV}-${VERSION}.tar.gz version.h *gcda *gcno $(PROJECT).info gcov \
--		.version-checks
-+		lib${PROJECT}.${SOVERSION}.dylib .version-checks
- 	$(QUIET)${MAKE} -C tests clean
- 	$(QUIET)${MAKE} -C po clean
+-${BUILDDIR_RELEASE}/${BINDIR}/lib${PROJECT}.so.${SOVERSION}: ${OBJECTS}
++${BUILDDIR_RELEASE}/${BINDIR}/lib${PROJECT}.${SOVERSION}.dylib: ${OBJECTS}
+ 	$(call colorecho,LD,$@)
+ 	@mkdir -p ${BUILDDIR_RELEASE}/${BINDIR}
+-	$(QUIET)${CC} -Wl,${SONAME_FLAG},lib${PROJECT}.so.${SOMAJOR} \
+-		${SHARED_FLAG} ${LDFLAGS} -o $@ ${OBJECTS} ${LIBS}
++	$(QUIET)${CC} -Wl,${SONAME_FLAG},${LIBDIR}/lib${PROJECT}.${SOMAJOR}.dylib \
++		${SHARED_FLAG} ${OSX_FLAGS} ${LDFLAGS} -o $@ ${OBJECTS} ${LIBS}
  
-@@ -86,7 +86,7 @@
+ ${PROJECT}: static shared
+ ${PROJECTNV}: ${PROJECT}
+ static: ${BUILDDIR_RELEASE}/${BINDIR}/lib${PROJECT}.a
+-shared: ${BUILDDIR_RELEASE}/${BINDIR}/lib${PROJECT}.so.${SOVERSION}
++shared: ${BUILDDIR_RELEASE}/${BINDIR}/lib${PROJECT}.${SOVERSION}.dylib
+ release: ${PROJECT}
  
- lib${PROJECT}-debug.so.${SOVERSION}: ${DOBJECTS}
- 	$(ECHO) LD $@
--	$(QUIET)${CC} -Wl,-soname,lib${PROJECT}.so.${SOMAJOR} -shared ${LDFLAGS} -o $@ ${DOBJECTS} ${LIBS}
-+	$(QUIET)${CC} -Wl,-dylib_install_name,${LIBDIR}/lib${PROJECT}.${SOMAJOR}.dylib -dynamiclib -current_version ${SOVERSION} -compatibility_version ${SOMAJOR} ${LDFLAGS} -o lib${PROJECT}.${SOVERSION}.dylib ${DOBJECTS} ${LIBS}
+ # debug build
+@@ -142,14 +143,14 @@
+ 	@mkdir -p ${BUILDDIR_DEBUG}/${BINDIR}
+ 	$(QUIET)${AR} rcs $@ ${OBJECTS_DEBUG}
  
- debug: options ${PROJECT}-debug
+-${BUILDDIR_DEBUG}/${BINDIR}/lib${PROJECT}.so.${SOVERSION}: ${OBJECTS_DEBUG}
++${BUILDDIR_DEBUG}/${BINDIR}/lib${PROJECT}.${SOVERSION}.dylib: ${OBJECTS_DEBUG}
+ 	$(call colorecho,LD,$@)
+ 	@mkdir -p ${BUILDDIR_DEBUG}/${BINDIR}
+-	$(QUIET)${CC} -Wl,${SONAME_FLAG},lib${PROJECT}.so.${SOMAJOR} ${SHARED_FLAG} ${LDFLAGS} -o $@ ${OBJECTS_DEBUG} ${LIBS}
++	$(QUIET)${CC} -Wl,${SONAME_FLAG},${LIBDIR}/lib${PROJECT}.${SOMAJOR}.dylib ${SHARED_FLAG} ${OSX_FLAGS} ${LDFLAGS} -o $@ ${OBJECTS_DEBUG} ${LIBS}
  
-@@ -139,10 +139,10 @@
+ ${PROJECT}-debug: \
+ 	${BUILDDIR_DEBUG}/${BINDIR}/lib${PROJECT}.a \
+-	${BUILDDIR_DEBUG}/${BINDIR}/lib${PROJECT}.so.${SOVERSION}
++	${BUILDDIR_DEBUG}/${BINDIR}/lib${PROJECT}.${SOVERSION}.dylib
+ debug: ${PROJECT}-debug
+ 
+ # gcov build
+@@ -171,11 +172,11 @@
+ 	@mkdir -p ${BUILDDIR_GCOV}/${BINDIR}
+ 	$(QUIET)${AR} rcs $@ ${OBJECTS_GCOV}
+ 
+-${BUILDDIR_GCOV}/${BINDIR}/lib${PROJECT}.so.${SOVERSION}: ${OBJECTS_GCOV}
++${BUILDDIR_GCOV}/${BINDIR}/lib${PROJECT}.${SOVERSION}.dylib: ${OBJECTS_GCOV}
+ 	$(call colorecho,LD,$@)
+ 	@mkdir -p ${BUILDDIR_GCOV}/${BINDIR}
+-	$(QUIET)${CC} -Wl,${SONAME_FLAG},lib${PROJECT}.so.${SOMAJOR} ${SHARED_FLAG} \
+-		${GCOV_LDFLAGS} -o $@ ${OBJECTS_GCOV} ${LIBS}
++	$(QUIET)${CC} -Wl,${SONAME_FLAG},${LIBDIR}/lib${PROJECT}.${SOMAJOR}.dylib ${SHARED_FLAG} \
++		${OSX_FLAGS} ${GCOV_LDFLAGS} -o $@ ${OBJECTS_GCOV} ${LIBS}
+ 
+ ${PROJECT}-gcov: ${BUILDDIR_GCOV}/${BINDIR}/lib${PROJECT}.a
+ gcov: ${PROJECT}-gcov
+@@ -245,11 +246,11 @@
  install-shared: shared
- 	$(ECHO) installing shared library
+ 	$(call colorecho,INSTALL,"Install shared library")
  	$(QUIET)mkdir -m 755 -p ${DESTDIR}${LIBDIR}
--	$(QUIET)install -m 644 lib${PROJECT}.so.${SOVERSION} ${DESTDIR}${LIBDIR}
+-	$(QUIET)install -m 644 ${BUILDDIR_RELEASE}/${BINDIR}/lib${PROJECT}.so.${SOVERSION} ${DESTDIR}${LIBDIR}
 -	$(QUIET)ln -sf lib${PROJECT}.so.${SOVERSION} ${DESTDIR}${LIBDIR}/lib${PROJECT}.so.${SOMAJOR} || \
-+	$(QUIET)install -m 644 lib${PROJECT}.${SOVERSION}.dylib ${DESTDIR}${LIBDIR}
+-		echo "Failed to create lib${PROJECT}.so.${SOMAJOR}. Please check if it exists and points to the correct version of lib${PROJECT}.so."
+-	$(QUIET)ln -sf lib${PROJECT}.so.${SOVERSION} ${DESTDIR}${LIBDIR}/lib${PROJECT}.so || \
+-		echo "Failed to create lib${PROJECT}.so. Please check if it exists and points to the correct version of lib${PROJECT}.so."
++	$(QUIET)install -m 644 ${BUILDDIR_RELEASE}/${BINDIR}/lib${PROJECT}.${SOVERSION}.dylib ${DESTDIR}${LIBDIR}
 +	$(QUIET)ln -sf lib${PROJECT}.${SOVERSION}.dylib ${DESTDIR}${LIBDIR}/lib${PROJECT}.${SOMAJOR}.dylib || \
- 		echo "Failed to create lib${PROJECT}.so.${SOMAJOR}. Please check if it exists and points to the correct version of lib${PROJECT}.so."
--	$(QUIET)ln -sf lib${PROJECT}.so.${SOVERSION} ${DESTDIR}${LIBDIR}/lib${PROJECT}.so || \
++		echo "Failed to create lib${PROJECT}.${SOMAJOR}.dylib. Please check if it exists and points to the correct version of lib${PROJECT}.dylib"
 +	$(QUIET)ln -sf lib${PROJECT}.${SOVERSION}.dylib ${DESTDIR}${LIBDIR}/lib${PROJECT}.dylib || \
- 		echo "Failed to create lib${PROJECT}.so. Please check if it exists and points to the correct version of lib${PROJECT}.so."
++		echo "Failed to create lib${PROJECT}.dylib. Please check if it exists and points to the correct version of lib${PROJECT}.dylib."
  
- install: options po install-static install-shared install-headers
-@@ -159,7 +159,9 @@
+ install-headers: ${PROJECTNV}/version.h ${BUILDDIR}/${PROJECT}.pc
+ 	$(call colorecho,INSTALL,"Install pkg-config file")
+@@ -268,8 +269,8 @@
+ 
  uninstall: uninstall-headers
- 	$(ECHO) removing library file
- 	$(QUIET)rm -f ${LIBDIR}/lib${PROJECT}.a ${LIBDIR}/lib${PROJECT}.so.${SOVERSION} \
+ 	$(call colorecho,UNINSTALL,"Remove library files")
+-	$(QUIET)rm -f ${LIBDIR}/lib${PROJECT}.a ${LIBDIR}/lib${PROJECT}.so.${SOVERSION} \
 -		${LIBDIR}/lib${PROJECT}.so.${SOMAJOR} ${LIBDIR}/lib${PROJECT}.so
-+		${LIBDIR}/lib${PROJECT}.so.${SOMAJOR} ${LIBDIR}/lib${PROJECT}.so \
-+		${LIBDIR}/lib${PROJECT}.${SOVERSION}.dylib \
++	$(QUIET)rm -f ${LIBDIR}/lib${PROJECT}.a ${LIBDIR}/lib${PROJECT}.${SOVERSION}.dylib \
 +		${LIBDIR}/lib${PROJECT}.${SOMAJOR}.dylib ${LIBDIR}/lib${PROJECT}.dylib
  	$(QUIET)${MAKE} -C po uninstall
  

Added: trunk/dports/devel/girara/files/patch-getline.diff
===================================================================
--- trunk/dports/devel/girara/files/patch-getline.diff	                        (rev 0)
+++ trunk/dports/devel/girara/files/patch-getline.diff	2015-05-27 21:05:53 UTC (rev 136820)
@@ -0,0 +1,219 @@
+--- /dev/null	2015-05-26 09:17:00.000000000 -0500
++++ girara/getdelim.c	2015-05-26 09:19:11.000000000 -0500
+@@ -0,0 +1,119 @@
++/* getdelim.c --- Implementation of replacement getdelim function.
++   Copyright (C) 1994, 1996, 1997, 1998, 2001, 2003, 2005 Free
++   Software Foundation, Inc.
++
++   This program is free software; you can redistribute it and/or
++   modify it under the terms of the GNU General Public License as
++   published by the Free Software Foundation; either version 2, or (at
++   your option) any later version.
++
++   This program is distributed in the hope that it will be useful, but
++   WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   General Public License for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with this program; if not, write to the Free Software
++   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
++   02110-1301, USA.  */
++
++/* Ported from glibc by Simon Josefsson. */
++
++#ifdef HAVE_CONFIG_H
++# include <config.h>
++#endif
++
++#include <stdlib.h>
++#include <errno.h>
++
++#include "getdelim.h"
++
++#if !HAVE_FLOCKFILE
++# undef flockfile
++# define flockfile(x) ((void) 0)
++#endif
++#if !HAVE_FUNLOCKFILE
++# undef funlockfile
++# define funlockfile(x) ((void) 0)
++#endif
++
++/* Read up to (and including) a DELIMITER from FP into *LINEPTR (and
++   NUL-terminate it).  *LINEPTR is a pointer returned from malloc (or
++   NULL), pointing to *N characters of space.  It is realloc'ed as
++   necessary.  Returns the number of characters read (not including
++   the null terminator), or -1 on error or EOF.  */
++
++ssize_t
++getdelim (char **lineptr, size_t *n, int delimiter, FILE *fp)
++{
++  int result = 0;
++  ssize_t cur_len = 0;
++  ssize_t len;
++
++  if (lineptr == NULL || n == NULL || fp == NULL)
++    {
++      errno = EINVAL;
++      return -1;
++    }
++
++  flockfile (fp);
++
++  if (*lineptr == NULL || *n == 0)
++    {
++      *n = 120;
++      *lineptr = (char *) malloc (*n);
++      if (*lineptr == NULL)
++	{
++	  result = -1;
++	  goto unlock_return;
++	}
++    }
++
++  for (;;)
++    {
++      char *t;
++      int i;
++
++      i = getc (fp);
++      if (i == EOF)
++      {
++	result = -1;
++	break;
++      }
++
++      /* Make enough space for len+1 (for final NUL) bytes.  */
++      if (cur_len + 1 >= *n)
++	{
++	  size_t needed = 2 * (cur_len + 1) + 1;   /* Be generous. */
++	  char *new_lineptr;
++
++	  if (needed < cur_len)
++	    {
++	      result = -1;
++	      goto unlock_return;
++	    }
++
++	  new_lineptr = (char *) realloc (*lineptr, needed);
++	  if (new_lineptr == NULL)
++	    {
++	      result = -1;
++	      goto unlock_return;
++	    }
++
++	  *lineptr = new_lineptr;
++	  *n = needed;
++	}
++
++      (*lineptr)[cur_len] = i;
++      cur_len++;
++
++      if (i == delimiter)
++	break;
++    }
++  (*lineptr)[cur_len] = '\0';
++  result = cur_len ? cur_len : result;
++
++ unlock_return:
++  funlockfile (fp);
++  return result;
++}
+--- /dev/null	2015-05-26 09:17:00.000000000 -0500
++++ girara/getdelim.h	2015-05-26 09:19:11.000000000 -0500
+@@ -0,0 +1,28 @@
++/* getdelim.h --- Prototype for replacement getdelim function.
++   Copyright (C) 2005 Free Software Foundation, Inc.
++
++   This program is free software; you can redistribute it and/or
++   modify it under the terms of the GNU General Public License as
++   published by the Free Software Foundation; either version 2, or (at
++   your option) any later version.
++
++   This program is distributed in the hope that it will be useful, but
++   WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   General Public License for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with this program; if not, write to the Free Software
++   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
++   02110-1301, USA.  */
++
++/* Written by Simon Josefsson. */
++
++/* Get size_t, FILE, ssize_t.  And getdelim, if available.  */
++# include <stddef.h>
++# include <stdio.h>
++# include <sys/types.h>
++
++#if !HAVE_DECL_GETDELIM
++ssize_t getdelim (char **lineptr, size_t *n, int delimiter, FILE *stream);
++#endif /* !HAVE_GETDELIM */
+--- /dev/null	2015-05-26 09:17:00.000000000 -0500
++++ girara/getline.c	2015-05-26 09:19:11.000000000 -0500
+@@ -0,0 +1,32 @@
++/* getline.c --- Implementation of replacement getline function.
++   Copyright (C) 2005 Free Software Foundation, Inc.
++
++   This program is free software; you can redistribute it and/or
++   modify it under the terms of the GNU General Public License as
++   published by the Free Software Foundation; either version 2, or (at
++   your option) any later version.
++
++   This program is distributed in the hope that it will be useful, but
++   WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   General Public License for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with this program; if not, write to the Free Software
++   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
++   02110-1301, USA.  */
++
++/* Written by Simon Josefsson. */
++
++#ifdef HAVE_CONFIG_H
++# include <config.h>
++#endif
++
++#include "getdelim.h"
++#include "getline.h"
++
++ssize_t
++getline (char **lineptr, size_t *n, FILE *stream)
++{
++  return getdelim (lineptr, n, '\n', stream);
++}
+--- /dev/null	2015-05-26 09:17:00.000000000 -0500
++++ girara/getline.h	2015-05-26 09:19:11.000000000 -0500
+@@ -0,0 +1,28 @@
++/* getline.h --- Prototype for replacement getline function.
++   Copyright (C) 2005 Free Software Foundation, Inc.
++
++   This program is free software; you can redistribute it and/or
++   modify it under the terms of the GNU General Public License as
++   published by the Free Software Foundation; either version 2, or (at
++   your option) any later version.
++
++   This program is distributed in the hope that it will be useful, but
++   WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   General Public License for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with this program; if not, write to the Free Software
++   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
++   02110-1301, USA.  */
++
++/* Written by Simon Josefsson. */
++
++/* Get size_t, FILE, ssize_t.  And getline, if available.  */
++# include <stddef.h>
++# include <stdio.h>
++# include <sys/types.h>
++
++#if !HAVE_DECL_GETLINE
++ssize_t getline (char **lineptr, size_t *n, FILE *stream);
++#endif /* !HAVE_GETLINE */
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150527/3616ca94/attachment-0001.html>


More information about the macports-changes mailing list