[Midnightbsd-cvs] mports [17883] trunk/devel/glib20/files: add missing files

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Thu Dec 18 03:22:56 EST 2014


Revision: 17883
          http://svnweb.midnightbsd.org/mports/?rev=17883
Author:   laffer1
Date:     2014-12-14 11:23:18 -0500 (Sun, 14 Dec 2014)
Log Message:
-----------
add missing files

Added Paths:
-----------
    trunk/devel/glib20/files/patch-configure
    trunk/devel/glib20/files/patch-docs_reference_Makefile.in
    trunk/devel/glib20/files/patch-glib_gconvert.c
    trunk/devel/glib20/files/patch-glib_libcharset_Makefile.in
    trunk/devel/glib20/files/patch-gmodule_gmodule-dl.c

Added: trunk/devel/glib20/files/patch-configure
===================================================================
--- trunk/devel/glib20/files/patch-configure	                        (rev 0)
+++ trunk/devel/glib20/files/patch-configure	2014-12-14 16:23:18 UTC (rev 17883)
@@ -0,0 +1,16 @@
+--- configure.orig	2014-09-28 09:31:41.079343419 +0200
++++ configure	2014-09-28 09:31:41.243342071 +0200
+@@ -26730,9 +26728,12 @@
+   *android*)
+     G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS"
+     ;;
+-  *-*-freebsd*|*-*-linux*)
++  *-*-linux*)
+     G_THREAD_LIBS_FOR_GTHREAD="`echo $G_THREAD_LIBS | sed s/-pthread/-lpthread/`"
+     ;;
++  *-*-freebsd*)
++    LDFLAGS="$LDFLAGS -pthread"
++    ;;    
+   *)
+     G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS"
+     ;;


Property changes on: trunk/devel/glib20/files/patch-configure
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/devel/glib20/files/patch-docs_reference_Makefile.in
===================================================================
--- trunk/devel/glib20/files/patch-docs_reference_Makefile.in	                        (rev 0)
+++ trunk/devel/glib20/files/patch-docs_reference_Makefile.in	2014-12-14 16:23:18 UTC (rev 17883)
@@ -0,0 +1,11 @@
+--- docs/reference/Makefile.in.orig	2013-09-26 18:08:36.000000000 +0200
++++ docs/reference/Makefile.in	2013-09-26 18:08:53.000000000 +0200
+@@ -422,7 +422,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = glib gobject gio
++SUBDIRS = #glib gobject gio
+ all: all-recursive
+ 
+ .SUFFIXES:


Property changes on: trunk/devel/glib20/files/patch-docs_reference_Makefile.in
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/devel/glib20/files/patch-glib_gconvert.c
===================================================================
--- trunk/devel/glib20/files/patch-glib_gconvert.c	                        (rev 0)
+++ trunk/devel/glib20/files/patch-glib_gconvert.c	2014-12-14 16:23:18 UTC (rev 17883)
@@ -0,0 +1,14 @@
+Work around our situation of having both libiconv in libc and libiconv from
+ports installed.
+
+--- glib/gconvert.c.orig	2014-02-08 10:15:50.000000000 +0100
++++ glib/gconvert.c	2014-02-08 10:16:52.000000000 +0100
+@@ -62,7 +62,7 @@
+ #error GNU libiconv in use but included iconv.h not from libiconv
+ #endif
+ #if !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H) \
+-     && !defined (__APPLE_CC__) && !defined (__LP_64__)
++  && !defined (LIBICONV_PLUG) && !defined (__APPLE_CC__) && !defined (__LP_64__)
+ #error GNU libiconv not in use but included iconv.h is from libiconv
+ #endif
+ 


Property changes on: trunk/devel/glib20/files/patch-glib_gconvert.c
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/devel/glib20/files/patch-glib_libcharset_Makefile.in
===================================================================
--- trunk/devel/glib20/files/patch-glib_libcharset_Makefile.in	                        (rev 0)
+++ trunk/devel/glib20/files/patch-glib_libcharset_Makefile.in	2014-12-14 16:23:18 UTC (rev 17883)
@@ -0,0 +1,11 @@
+--- glib/libcharset/Makefile.in.orig	2010-08-08 12:46:01.000000000 +0200
++++ glib/libcharset/Makefile.in	2010-08-08 12:46:01.000000000 +0200
+@@ -566,7 +566,7 @@ install-dvi: install-dvi-am
+ 
+ install-dvi-am:
+ 
+-install-exec-am: install-exec-local
++install-exec-am: # install-exec-local
+ 
+ install-html: install-html-am
+ 


Property changes on: trunk/devel/glib20/files/patch-glib_libcharset_Makefile.in
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/devel/glib20/files/patch-gmodule_gmodule-dl.c
===================================================================
--- trunk/devel/glib20/files/patch-gmodule_gmodule-dl.c	                        (rev 0)
+++ trunk/devel/glib20/files/patch-gmodule_gmodule-dl.c	2014-12-14 16:23:18 UTC (rev 17883)
@@ -0,0 +1,20 @@
+--- gmodule/gmodule-dl.c.orig	Sat Feb 17 08:28:07 2001
++++ gmodule/gmodule-dl.c	Fri Jan 18 09:48:45 2002
+@@ -104,6 +104,7 @@
+ static gpointer
+ _g_module_self (void)
+ {
++#ifndef __FreeBSD__
+   gpointer handle;
+   
+   /* to query symbols from the program itself, special link options
+@@ -115,6 +116,9 @@
+     g_module_set_error (fetch_dlerror (TRUE));
+   
+   return handle;
++#else
++  return RTLD_DEFAULT;
++#endif
+ }
+ 
+ static void


Property changes on: trunk/devel/glib20/files/patch-gmodule_gmodule-dl.c
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property


More information about the Midnightbsd-cvs mailing list