summaryrefslogtreecommitdiffstats
path: root/devel/glib20/files
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2005-03-14 09:21:27 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2005-03-14 09:21:27 +0800
commit6ea8cdadd34fade98a807bf84429806612c65079 (patch)
treeb7f18e7e629139c395bf0080243a2218963d0301 /devel/glib20/files
parent857bb773fe0bad1b58fa9c68ece3c326f60613e6 (diff)
downloadmarcuscom-ports-6ea8cdadd34fade98a807bf84429806612c65079.tar
marcuscom-ports-6ea8cdadd34fade98a807bf84429806612c65079.tar.gz
marcuscom-ports-6ea8cdadd34fade98a807bf84429806612c65079.tar.bz2
marcuscom-ports-6ea8cdadd34fade98a807bf84429806612c65079.tar.lz
marcuscom-ports-6ea8cdadd34fade98a807bf84429806612c65079.tar.xz
marcuscom-ports-6ea8cdadd34fade98a807bf84429806612c65079.tar.zst
marcuscom-ports-6ea8cdadd34fade98a807bf84429806612c65079.zip
Remove these ports now that they have been merged into the ports tree.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3934 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel/glib20/files')
-rw-r--r--devel/glib20/files/extra-patch-gthread_gthread-posix.c32
-rw-r--r--devel/glib20/files/patch-ae11
-rw-r--r--devel/glib20/files/patch-ag14
-rw-r--r--devel/glib20/files/patch-ah11
-rw-r--r--devel/glib20/files/patch-glib::libcharset::Makefile.in31
-rw-r--r--devel/glib20/files/patch-glib_gutils.c20
-rw-r--r--devel/glib20/files/patch-gmodule::gmodule-dl.c23
-rw-r--r--devel/glib20/files/patch-gthread_gthread-posix.c21
8 files changed, 0 insertions, 163 deletions
diff --git a/devel/glib20/files/extra-patch-gthread_gthread-posix.c b/devel/glib20/files/extra-patch-gthread_gthread-posix.c
deleted file mode 100644
index 8796dd629..000000000
--- a/devel/glib20/files/extra-patch-gthread_gthread-posix.c
+++ /dev/null
@@ -1,32 +0,0 @@
---- gthread/gthread-posix.c.orig Mon Nov 1 13:47:12 2004
-+++ gthread/gthread-posix.c Wed Mar 9 14:21:20 2005
-@@ -115,7 +115,11 @@
- # define PRIORITY_NORMAL_VALUE priority_normal_value
- #endif /* POSIX_MIN_PRIORITY && POSIX_MAX_PRIORITY */
-
-+#define G_THREAD_STACK_SIZE32 (1*1024*1024)
-+#define G_THREAD_STACK_SIZE64 (2*1024*1024)
-+
- static gulong g_thread_min_stack_size = 0;
-+static gulong g_thread_default_stack_size = 0;
-
- #define G_MUTEX_SIZE (sizeof (pthread_mutex_t))
-
-@@ -307,8 +312,16 @@
- if (stack_size)
- {
- stack_size = MAX (g_thread_min_stack_size, stack_size);
-- posix_check_cmd (pthread_attr_setstacksize (&attr, stack_size));
- }
-+ else
-+ {
-+ if (sizeof(void *) == 8)
-+ g_thread_default_stack_size = G_THREAD_STACK_SIZE64;
-+ else
-+ g_thread_default_stack_size = G_THREAD_STACK_SIZE32;
-+ stack_size = MAX (g_thread_min_stack_size, g_thread_default_stack_size);
-+ }
-+ posix_check_cmd (pthread_attr_setstacksize (&attr, stack_size));
- #endif /* HAVE_PTHREAD_ATTR_SETSTACKSIZE */
-
- #ifdef PTHREAD_SCOPE_SYSTEM
diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae
deleted file mode 100644
index 89850e102..000000000
--- a/devel/glib20/files/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig Fri Apr 30 09:05:01 2004
-+++ configure Tue May 4 12:52:56 2004
-@@ -31818,6 +31819,8 @@
- ;;
- esac
- fi
-+ G_THREAD_CFLAGS="${PTHREAD_CFLAGS}"
-+ G_THREAD_LIBS="${PTHREAD_LIBS}"
-
- if test x"$G_THREAD_CFLAGS" = x; then
-
diff --git a/devel/glib20/files/patch-ag b/devel/glib20/files/patch-ag
deleted file mode 100644
index 3e8fbfbf4..000000000
--- a/devel/glib20/files/patch-ag
+++ /dev/null
@@ -1,14 +0,0 @@
---- Makefile.in.orig Sun Dec 23 16:53:53 2001
-+++ Makefile.in Fri Feb 8 12:44:30 2002
-@@ -151,3 +151,3 @@
-
--SUBDIRS = . m4macros glib gobject gmodule gthread tests build po docs
-+SUBDIRS = . m4macros glib gobject gmodule gthread build po docs
-
-@@ -192,4 +192,4 @@
-
--
--configexecincludedir = $(libdir)/glib-2.0/include
-+glibincludedir = $(includedir)/glib-2.0
-+configexecincludedir = $(glibincludedir)
-
diff --git a/devel/glib20/files/patch-ah b/devel/glib20/files/patch-ah
deleted file mode 100644
index c339b76e2..000000000
--- a/devel/glib20/files/patch-ah
+++ /dev/null
@@ -1,11 +0,0 @@
---- docs/reference/Makefile.in.orig Fri Oct 24 18:05:32 2003
-+++ docs/reference/Makefile.in Fri Oct 24 18:06:00 2003
-@@ -226,7 +226,7 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--SUBDIRS = glib gobject
-+SUBDIRS = #glib gobject
- subdir = docs/reference
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
diff --git a/devel/glib20/files/patch-glib::libcharset::Makefile.in b/devel/glib20/files/patch-glib::libcharset::Makefile.in
deleted file mode 100644
index 9afd57416..000000000
--- a/devel/glib20/files/patch-glib::libcharset::Makefile.in
+++ /dev/null
@@ -1,31 +0,0 @@
---- glib/libcharset/Makefile.in.orig Fri Apr 30 12:10:27 2004
-+++ glib/libcharset/Makefile.in Fri Apr 30 12:12:01 2004
-@@ -225,7 +225,7 @@
- target_alias = @target_alias@
-
- INCLUDES = \
-- -DLIBDIR=\"$(libdir)\" -I$(top_srcdir)
-+ -DLIBDIR=\"$(prefix)/libdata\" -I$(top_srcdir)
-
-
- noinst_LTLIBRARIES = libcharset.la
-@@ -246,8 +246,8 @@
- make-patch.sh
-
-
--charset_alias = $(DESTDIR)$(libdir)/charset.alias
--charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
-+charset_alias = $(DESTDIR)$(prefix)/libdata/charset.alias
-+charset_tmp = $(DESTDIR)$(prefix)/libdata/charset.tmp
-
- SUFFIXES = .sed .sin
-
-@@ -487,7 +487,7 @@
-
- install-data-am:
-
--install-exec-am: install-exec-local
-+install-exec-am: # install-exec-local
-
- install-info: install-info-am
-
diff --git a/devel/glib20/files/patch-glib_gutils.c b/devel/glib20/files/patch-glib_gutils.c
deleted file mode 100644
index d32b910ad..000000000
--- a/devel/glib20/files/patch-glib_gutils.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- glib/gutils.c.orig Sat Sep 4 15:49:27 2004
-+++ glib/gutils.c Sat Sep 4 15:55:24 2004
-@@ -1466,7 +1466,7 @@
- data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS");
-
- if (!data_dirs || !data_dirs[0])
-- data_dirs = "/usr/local/share/:/usr/share/";
-+ data_dirs = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/";
- #endif
- data_dir_vector = g_strsplit (data_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
-
-@@ -1509,7 +1509,7 @@
- conf_dirs = (gchar *) g_getenv ("XDG_CONFIG_DIRS");
-
- if (!conf_dirs || !conf_dirs[0])
-- conf_dirs = "/etc/xdg";
-+ conf_dirs = "%%X11BASE%%/etc/xdg:/usr/local/etc/xdg:/etc/xdg";
- #endif
- conf_dir_vector = g_strsplit (conf_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
- }
diff --git a/devel/glib20/files/patch-gmodule::gmodule-dl.c b/devel/glib20/files/patch-gmodule::gmodule-dl.c
deleted file mode 100644
index eaa43a74e..000000000
--- a/devel/glib20/files/patch-gmodule::gmodule-dl.c
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- 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
diff --git a/devel/glib20/files/patch-gthread_gthread-posix.c b/devel/glib20/files/patch-gthread_gthread-posix.c
deleted file mode 100644
index 47c5ab8f1..000000000
--- a/devel/glib20/files/patch-gthread_gthread-posix.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- gthread/gthread-posix.c.orig Mon Nov 1 13:47:12 2004
-+++ gthread/gthread-posix.c Wed Mar 9 14:21:20 2005
-@@ -125,7 +129,8 @@
- g_thread_impl_init(void)
- {
- #ifdef _SC_THREAD_STACK_MIN
-- g_thread_min_stack_size = MAX (sysconf (_SC_THREAD_STACK_MIN), 0);
-+ g_thread_min_stack_size = MAX (sysconf (_SC_THREAD_STACK_MIN),
-+ g_thread_min_stack_size);
- #endif /* _SC_THREAD_STACK_MIN */
- #ifdef HAVE_PRIORITIES
- # ifdef G_THREADS_IMPL_POSIX
-@@ -176,7 +181,7 @@
- result = pthread_mutex_trylock ((pthread_mutex_t *) mutex);
-
- #ifdef G_THREADS_IMPL_POSIX
-- if (result == EBUSY)
-+ if ((result == EBUSY) || (result == EDEADLK))
- return FALSE;
- #else /* G_THREADS_IMPL_DCE */
- if (result == 0)