Move some more files back to bockbuild repo

9 files changed, 0 insertions, 348 deletions

diff --git a/packaging/MacSDK/patches/gettext-no-samples.patch b/packaging/MacSDK/patches/gettext-no-samples.patch
deleted file mode 100644
index 80c198fd67f..00000000000
--- a/packaging/MacSDK/patches/gettext-no-samples.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/gettext-tools/Makefile.in.orig	2010-06-03 16:38:55.000000000 -0500
-+++ b/gettext-tools/Makefile.in	2010-06-04 01:16:07.000000000 -0500
-@@ -1248,7 +1248,7 @@
- top_srcdir = @top_srcdir@
- AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
- ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4
--SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests gnulib-tests examples
-+SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests gnulib-tests
-
- # Allow users to use "gnulib-tool --update".
diff --git a/packaging/MacSDK/patches/glib/config.h.ed b/packaging/MacSDK/patches/glib/config.h.ed
deleted file mode 100644
index bbf6cf4545e..00000000000
--- a/packaging/MacSDK/patches/glib/config.h.ed
+++ /dev/null
@@ -1,32 +0,0 @@
-/ AC_APPLE_UNIVERSAL_BUILD /c
-/* #undef AC_APPLE_UNIVERSAL_BUILD */
-.
-/ G_VA_COPY_AS_ARRAY /c
-#ifdef __LP64__
-#define G_VA_COPY_AS_ARRAY 1
-#else
-/* #undef G_VA_COPY_AS_ARRAY */
-#endif
-.
-/ SIZEOF_LONG /c
-#ifdef __LP64__
-#define SIZEOF_LONG 8
-#else
-#define SIZEOF_LONG 4
-#endif
-.
-/ SIZEOF_SIZE_T /c
-#ifdef __LP64__
-#define SIZEOF_SIZE_T 8
-#else
-#define SIZEOF_SIZE_T 4
-#endif
-.
-/ SIZEOF_VOID_P /c
-#ifdef __LP64__
-#define SIZEOF_VOID_P 8
-#else
-#define SIZEOF_VOID_P 4
-#endif
-.
-w
diff --git a/packaging/MacSDK/patches/glib/patch-configure.diff b/packaging/MacSDK/patches/glib/patch-configure.diff
deleted file mode 100644
index 09848ac4d8d..00000000000
--- a/packaging/MacSDK/patches/glib/patch-configure.diff
+++ /dev/null
@@ -1,203 +0,0 @@
---- configure.orig	2012-10-15 19:29:14.000000000 -0500
-+++ configure	2012-10-22 17:29:31.000000000 -0500
-@@ -5602,7 +5602,7 @@
- fi
-
- GLIB_RUNTIME_LIBDIR="$with_runtime_libdir"
--ABS_GLIB_RUNTIME_LIBDIR="`readlink -f $libdir/$with_runtime_libdir`"
-+ABS_GLIB_RUNTIME_LIBDIR="`readlink $libdir/$with_runtime_libdir`"
-
-
-  if test "x$with_runtime_libdir" != "x"; then
-@@ -30649,10 +30649,10 @@
- *)			glib_vacopy=''
- esac
-
--if test x$glib_cv_va_val_copy = xno; then
-   glib_vacopy="\$glib_vacopy
--#define G_VA_COPY_AS_ARRAY 1"
--fi
-+#ifdef __LP64__
-+#define G_VA_COPY_AS_ARRAY 1
-+#endif"
-
- if test x$glib_cv_hasinline = xyes; then
-     glib_inline='#define G_HAVE_INLINE 1'
-@@ -32411,18 +32411,32 @@
-	cat >>$outfile <<_______EOF
- #define G_HAVE_GINT64 1          /* deprecated, always true */
-
--${glib_extension}typedef signed $gint64 gint64;
--${glib_extension}typedef unsigned $gint64 guint64;
-+#ifdef __LP64__
-+${glib_extension}typedef signed long gint64;
-+${glib_extension}typedef unsigned long guint64;
-
--#define G_GINT64_CONSTANT(val)	$gint64_constant
--#define G_GUINT64_CONSTANT(val)	$guint64_constant
-+#define G_GINT64_CONSTANT(val)	(val##L)
-+#define G_GUINT64_CONSTANT(val)	(val##UL)
-+#else
-+${glib_extension}typedef signed long long gint64;
-+${glib_extension}typedef unsigned long long guint64;
-+
-+#define G_GINT64_CONSTANT(val)	(G_GNUC_EXTENSION (val##LL))
-+#define G_GUINT64_CONSTANT(val)	(G_GNUC_EXTENSION (val##ULL))
-+#endif
- _______EOF
-
-	if test x$gint64_format != x ; then
-	  cat >>$outfile <<_______EOF
--#define G_GINT64_MODIFIER $gint64_modifier
--#define G_GINT64_FORMAT $gint64_format
--#define G_GUINT64_FORMAT $guint64_format
-+#ifdef __LP64__
-+#define G_GINT64_MODIFIER "l"
-+#define G_GINT64_FORMAT "li"
-+#define G_GUINT64_FORMAT "lu"
-+#else
-+#define G_GINT64_MODIFIER "ll"
-+#define G_GINT64_FORMAT "lli"
-+#define G_GUINT64_FORMAT "llu"
-+#endif
- _______EOF
-         else
-	  cat >>$outfile <<_______EOF
-@@ -32434,9 +32448,15 @@
-
-         cat >>$outfile <<_______EOF
-
--#define GLIB_SIZEOF_VOID_P $glib_void_p
--#define GLIB_SIZEOF_LONG   $glib_long
--#define GLIB_SIZEOF_SIZE_T $glib_size_t
-+#ifdef __LP64__
-+#define GLIB_SIZEOF_VOID_P 8
-+#define GLIB_SIZEOF_LONG   8
-+#define GLIB_SIZEOF_SIZE_T 8
-+#else
-+#define GLIB_SIZEOF_VOID_P 4
-+#define GLIB_SIZEOF_LONG   4
-+#define GLIB_SIZEOF_SIZE_T 4
-+#endif
-
- _______EOF
-
-@@ -32464,18 +32484,33 @@
-	if test -z "$glib_unknown_void_p"; then
-	  cat >>$outfile <<_______EOF
-
--#define GPOINTER_TO_INT(p)	((gint)  ${glib_gpi_cast} (p))
--#define GPOINTER_TO_UINT(p)	((guint) ${glib_gpui_cast} (p))
-+#ifdef __LP64__
-+#define GPOINTER_TO_INT(p)	((gint)  (glong) (p))
-+#define GPOINTER_TO_UINT(p)	((guint) (gulong) (p))
-+
-+#define GINT_TO_POINTER(i)	((gpointer) (glong) (i))
-+#define GUINT_TO_POINTER(u)	((gpointer) (gulong) (u))
-+
-+typedef signed long gintptr;
-+typedef unsigned long guintptr;
-+
-+#define G_GINTPTR_MODIFIER      "l"
-+#define G_GINTPTR_FORMAT        "li"
-+#define G_GUINTPTR_FORMAT       "lu"
-+#else
-+#define GPOINTER_TO_INT(p)	((gint)   (p))
-+#define GPOINTER_TO_UINT(p)	((guint)  (p))
-
--#define GINT_TO_POINTER(i)	((gpointer) ${glib_gpi_cast} (i))
--#define GUINT_TO_POINTER(u)	((gpointer) ${glib_gpui_cast} (u))
-+#define GINT_TO_POINTER(i)	((gpointer)  (i))
-+#define GUINT_TO_POINTER(u)	((gpointer)  (u))
-
--typedef signed $glib_intptr_type_define gintptr;
--typedef unsigned $glib_intptr_type_define guintptr;
-+typedef signed int gintptr;
-+typedef unsigned int guintptr;
-
--#define G_GINTPTR_MODIFIER      $gintptr_modifier
--#define G_GINTPTR_FORMAT        $gintptr_format
--#define G_GUINTPTR_FORMAT       $guintptr_format
-+#define G_GINTPTR_MODIFIER      ""
-+#define G_GINTPTR_FORMAT        "i"
-+#define G_GUINTPTR_FORMAT       "u"
-+#endif
- _______EOF
-	else
-	  echo '#error SIZEOF_VOID_P unknown - This should never happen' >>$outfile
-@@ -32588,7 +32623,9 @@
-
-	if test x"$g_memory_barrier_needed" != xno; then
-	  echo >>$outfile
-+	  echo "#ifdef __BIG_ENDIAN__" >>$outfile
-	  echo "#define G_ATOMIC_OP_MEMORY_BARRIER_NEEDED 1" >>$outfile
-+	  echo "#endif" >>$outfile
-	fi
-	if test x"$g_atomic_lock_free" = xyes; then
-           echo >>$outfile
-@@ -32598,27 +32635,52 @@
-	g_bit_sizes="16 32 64"
-	for bits in $g_bit_sizes; do
-	  cat >>$outfile <<_______EOF
--#define GINT${bits}_TO_${g_bs_native}(val)	((gint${bits}) (val))
--#define GUINT${bits}_TO_${g_bs_native}(val)	((guint${bits}) (val))
--#define GINT${bits}_TO_${g_bs_alien}(val)	((gint${bits}) GUINT${bits}_SWAP_LE_BE (val))
--#define GUINT${bits}_TO_${g_bs_alien}(val)	(GUINT${bits}_SWAP_LE_BE (val))
-+#ifdef __BIG_ENDIAN__
-+#define GINT${bits}_TO_BE(val)	((gint${bits}) (val))
-+#define GUINT${bits}_TO_BE(val)	((guint${bits}) (val))
-+#define GINT${bits}_TO_LE(val)	((gint${bits}) GUINT${bits}_SWAP_LE_BE (val))
-+#define GUINT${bits}_TO_LE(val)	(GUINT${bits}_SWAP_LE_BE (val))
-+#else
-+#define GINT${bits}_TO_LE(val)	((gint${bits}) (val))
-+#define GUINT${bits}_TO_LE(val)	((guint${bits}) (val))
-+#define GINT${bits}_TO_BE(val)	((gint${bits}) GUINT${bits}_SWAP_LE_BE (val))
-+#define GUINT${bits}_TO_BE(val)	(GUINT${bits}_SWAP_LE_BE (val))
-+#endif
- _______EOF
-	done
-
-	cat >>$outfile <<_______EOF
--#define GLONG_TO_LE(val)	((glong) GINT${glongbits}_TO_LE (val))
--#define GULONG_TO_LE(val)	((gulong) GUINT${glongbits}_TO_LE (val))
--#define GLONG_TO_BE(val)	((glong) GINT${glongbits}_TO_BE (val))
--#define GULONG_TO_BE(val)	((gulong) GUINT${glongbits}_TO_BE (val))
-+#ifdef __LP64__
-+#define GLONG_TO_LE(val)	((glong) GINT64_TO_LE (val))
-+#define GULONG_TO_LE(val)	((gulong) GUINT64_TO_LE (val))
-+#define GLONG_TO_BE(val)	((glong) GINT64_TO_BE (val))
-+#define GULONG_TO_BE(val)	((gulong) GUINT64_TO_BE (val))
-+#else
-+#define GLONG_TO_LE(val)	((glong) GINT32_TO_LE (val))
-+#define GULONG_TO_LE(val)	((gulong) GUINT32_TO_LE (val))
-+#define GLONG_TO_BE(val)	((glong) GINT32_TO_BE (val))
-+#define GULONG_TO_BE(val)	((gulong) GUINT32_TO_BE (val))
-+#endif
- #define GINT_TO_LE(val)		((gint) GINT${gintbits}_TO_LE (val))
- #define GUINT_TO_LE(val)	((guint) GUINT${gintbits}_TO_LE (val))
- #define GINT_TO_BE(val)		((gint) GINT${gintbits}_TO_BE (val))
- #define GUINT_TO_BE(val)	((guint) GUINT${gintbits}_TO_BE (val))
--#define GSIZE_TO_LE(val)	((gsize) GUINT${gsizebits}_TO_LE (val))
--#define GSSIZE_TO_LE(val)	((gssize) GINT${gsizebits}_TO_LE (val))
--#define GSIZE_TO_BE(val)	((gsize) GUINT${gsizebits}_TO_BE (val))
--#define GSSIZE_TO_BE(val)	((gssize) GINT${gsizebits}_TO_BE (val))
--#define G_BYTE_ORDER $g_byte_order
-+#ifdef __LP64__
-+#define GSIZE_TO_LE(val)	((gsize) GUINT64_TO_LE (val))
-+#define GSSIZE_TO_LE(val)	((gssize) GINT64_TO_LE (val))
-+#define GSIZE_TO_BE(val)	((gsize) GUINT64_TO_BE (val))
-+#define GSSIZE_TO_BE(val)	((gssize) GINT64_TO_BE (val))
-+#else
-+#define GSIZE_TO_LE(val)	((gsize) GUINT32_TO_LE (val))
-+#define GSSIZE_TO_LE(val)	((gssize) GINT32_TO_LE (val))
-+#define GSIZE_TO_BE(val)	((gsize) GUINT32_TO_BE (val))
-+#define GSSIZE_TO_BE(val)	((gssize) GINT32_TO_BE (val))
-+#endif
-+#ifdef __BIG_ENDIAN__
-+#define G_BYTE_ORDER G_BIG_ENDIAN
-+#else
-+#define G_BYTE_ORDER G_LITTLE_ENDIAN
-+#endif
-
- #define GLIB_SYSDEF_POLLIN =$g_pollin
- #define GLIB_SYSDEF_POLLOUT =$g_pollout
diff --git a/packaging/MacSDK/patches/glib/patch-gi18n.h.diff b/packaging/MacSDK/patches/glib/patch-gi18n.h.diff
deleted file mode 100644
index 3d3821b8a19..00000000000
--- a/packaging/MacSDK/patches/glib/patch-gi18n.h.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- glib/gi18n.h.orig	2008-11-23 23:45:23.000000000 -0600
-+++ glib/gi18n.h	2008-11-25 23:59:29.000000000 -0600
-@@ -27,7 +27,9 @@
-
- #define  _(String) gettext (String)
- #define Q_(String) g_dpgettext (NULL, String, 0)
-+#ifndef N_
- #define N_(String) (String)
-+#endif
- #define C_(Context,String) g_dpgettext (NULL, Context "\004" String, strlen (Context) + 1)
- #define NC_(Context, String) (String)
diff --git a/packaging/MacSDK/patches/glib/patch-gio_gdbusprivate.c.diff b/packaging/MacSDK/patches/glib/patch-gio_gdbusprivate.c.diff
deleted file mode 100644
index 5c77d56a011..00000000000
--- a/packaging/MacSDK/patches/glib/patch-gio_gdbusprivate.c.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- gio/gdbusprivate.c.orig	2012-04-30 11:24:02.000000000 -0500
-+++ gio/gdbusprivate.c	2012-05-02 01:57:47.000000000 -0500
-@@ -2094,7 +2094,7 @@
-   /* TODO: use PACKAGE_LOCALSTATEDIR ? */
-   ret = NULL;
-   first_error = NULL;
--  if (!g_file_get_contents ("/var/lib/dbus/machine-id",
-+  if (!g_file_get_contents ("@@PREFIX@@/var/lib/dbus/machine-id",
-                             &ret,
-                             NULL,
-                             &first_error) &&
-@@ -2104,7 +2104,7 @@
-                             NULL))
-     {
-       g_propagate_prefixed_error (error, first_error,
--                                  _("Unable to load /var/lib/dbus/machine-id or /etc/machine-id: "));
-+                                  _("Unable to load @@PREFIX@@/var/lib/dbus/machine-id or /etc/machine-id: "));
-     }
-   else
-     {
diff --git a/packaging/MacSDK/patches/glib/patch-gio_xdgmime_xdgmime.c.diff b/packaging/MacSDK/patches/glib/patch-gio_xdgmime_xdgmime.c.diff
deleted file mode 100644
index feaaed48115..00000000000
--- a/packaging/MacSDK/patches/glib/patch-gio_xdgmime_xdgmime.c.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- gio/xdgmime/xdgmime.c.orig	2009-03-12 22:09:52.000000000 -0600
-+++ gio/xdgmime/xdgmime.c	2009-04-09 23:41:01.000000000 -0600
-@@ -257,7 +257,7 @@
-
-   xdg_data_dirs = getenv ("XDG_DATA_DIRS");
-   if (xdg_data_dirs == NULL)
--    xdg_data_dirs = "/usr/local/share/:/usr/share/";
-+    xdg_data_dirs = "@@PREFIX@@/share/:/usr/share/";
-
-   ptr = xdg_data_dirs;
diff --git a/packaging/MacSDK/patches/glib/patch-glib-2.0.pc.in.diff b/packaging/MacSDK/patches/glib/patch-glib-2.0.pc.in.diff
deleted file mode 100644
index b15274e8c51..00000000000
--- a/packaging/MacSDK/patches/glib/patch-glib-2.0.pc.in.diff
+++ /dev/null
@@ -1,8 +0,0 @@
---- glib-2.0.pc.in.orig	2012-01-15 21:12:06.000000000 -0600
-+++ glib-2.0.pc.in	2012-01-19 22:29:43.000000000 -0600
-@@ -13,4 +13,4 @@
- Requires.private: @PCRE_REQUIRES@
- Libs: -L${libdir} -lglib-2.0 @INTLLIBS@
- Libs.private: @G_THREAD_LIBS@ @G_LIBS_EXTRA@ @PCRE_LIBS@ @INTLLIBS@ @ICONV_LIBS@
--Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include @GLIB_EXTRA_CFLAGS@
-+Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include -I${includedir} @GLIB_EXTRA_CFLAGS@
diff --git a/packaging/MacSDK/patches/glib/patch-glib_gunicollate.c.diff b/packaging/MacSDK/patches/glib/patch-glib_gunicollate.c.diff
deleted file mode 100644
index 2a49282d408..00000000000
--- a/packaging/MacSDK/patches/glib/patch-glib_gunicollate.c.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- glib/gunicollate.c.orig	2009-03-31 18:04:20.000000000 -0500
-+++ glib/gunicollate.c	2010-03-06 17:59:08.000000000 -0600
-@@ -26,6 +26,9 @@
- #include <wchar.h>
- #endif
-
-+/* Carbon is not available on 64-bit */
-+#undef HAVE_CARBON
-+
- #ifdef HAVE_CARBON
- #include <CoreServices/CoreServices.h>
- #endif
diff --git a/packaging/MacSDK/patches/murrine-osx.patch b/packaging/MacSDK/patches/murrine-osx.patch
deleted file mode 100644
index ae5b1f26302..00000000000
--- a/packaging/MacSDK/patches/murrine-osx.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/src/murrine_draw.c b/src/murrine_draw.c
-index 4cab20f..06ed9b1 100644
---- a/src/murrine_draw.c
-+++ b/src/murrine_draw.c
-@@ -1625,10 +1625,6 @@ murrine_draw_scrollbar_slider (cairo_t *cr,
-	}
-
-	cairo_restore (cr);
--
--	murrine_set_color_rgb (cr, &border);
--	murrine_rounded_rectangle (cr, 0.5, 0.5, width-1, height-1, widget->roundness, widget->corners);
--	cairo_stroke (cr);
- }
-
- static void
-@@ -1791,21 +1787,15 @@ murrine_draw_normal_arrow (cairo_t *cr,
- {
-	double arrow_width;
-	double arrow_height;
--	double line_width_2;
-
--	cairo_save (cr);
--
--	arrow_width = MIN (height*2.0 + MAX (1.0, ceil (height*2.0/6.0*2.0)/2.0)/2.0, width);
--	line_width_2 = MAX (1.0, ceil (arrow_width/6.0*2.0)/2.0)/2.0;
--	arrow_height = arrow_width/2.0+line_width_2;
-+	arrow_width = CLAMP (width, 3, 8);
-+	arrow_height = CLAMP (height, 3, 8);
-
--	cairo_translate (cr, x, y-arrow_height/2.0);
-+	cairo_save (cr);
-
--	cairo_move_to (cr, -arrow_width/2.0, line_width_2);
--	cairo_line_to (cr, -arrow_width/2.0 + line_width_2, 0);
--	cairo_arc_negative (cr, 0, arrow_height-2*line_width_2-2*line_width_2*sqrt(2), 2*line_width_2, M_PI_2+M_PI_4, M_PI_4);
--	cairo_line_to (cr, arrow_width/2.0-line_width_2, 0);
--	cairo_line_to (cr, arrow_width/2.0, line_width_2);
-+	cairo_translate (cr, x, y - arrow_height / 2.0);
-+	cairo_move_to (cr, -arrow_width / 2.0, 0);
-+	cairo_line_to (cr, arrow_width / 2.0, 0);
-	cairo_line_to (cr, 0, arrow_height);
-	cairo_close_path (cr);