Fri Jun 8 19:37:17 UTC 2012

6 files changed, 0 insertions, 336 deletions

diff --git a/extra/libxft/git_fixes.diff b/extra/libxft/git_fixes.diff
deleted file mode 100644
index 3a7155271..000000000
--- a/extra/libxft/git_fixes.diff
+++ /dev/null
@@ -1,43 +0,0 @@
-From 84b8b5b46773f9b686d57f28092824b86bffed9d Mon Sep 17 00:00:00 2001
-From: Mikael Magnusson <mikachu@gmail.com>
-Date: Sun, 11 Mar 2012 01:41:55 +0000
-Subject: Fixup for 550b2f76401c2 which broke bold fonts
-
-The commit removed the line
-AC_CHECK_FUNCS(FT_Get_Next_Char FT_Get_BDF_Property FT_Get_PS_Font_Info FT_Has_PS_Glyph_Names FT_GlyphSlot_Embolden)
-but failed to remove the #if lines that this commit removes, resulting
-in that code never being executed.
-
-Fixes: https://bugs.freedesktop.org/attachment.cgi?id=58280
-
-Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
----
-diff --git a/src/xftglyphs.c b/src/xftglyphs.c
-index 4a3b9d6..2f3dc5a 100644
---- a/src/xftglyphs.c
-+++ b/src/xftglyphs.c
-@@ -24,9 +24,7 @@
- #include <freetype/ftoutln.h>
- #include <freetype/ftlcdfil.h>
- 
--#if HAVE_FT_GLYPHSLOT_EMBOLDEN
- #include <freetype/ftsynth.h>
--#endif
- 
- /*
-  * Validate the memory info for a font
-@@ -434,12 +432,10 @@ XftFontLoadGlyphs (Display	    *dpy,
- 
- 	glyphslot = face->glyph;
- 
--#if HAVE_FT_GLYPHSLOT_EMBOLDEN
- 	/*
- 	 * Embolden if required
- 	 */
- 	if (font->info.embolden) FT_GlyphSlot_Embolden(glyphslot);
--#endif
- 
- 	/*
- 	 * Compute glyph metrics from FreeType information
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/mod_perl/mod_perl-2.0.6-perl-5.16-fixes.patch b/extra/mod_perl/mod_perl-2.0.6-perl-5.16-fixes.patch
deleted file mode 100644
index 4e26fd87d..000000000
--- a/extra/mod_perl/mod_perl-2.0.6-perl-5.16-fixes.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -upr mod_perl-2.0.6.orig/src/modules/perl/modperl_perl.c mod_perl-2.0.6/src/modules/perl/modperl_perl.c
---- mod_perl-2.0.6.orig/src/modules/perl/modperl_perl.c	2012-05-26 21:49:27.000000000 +0300
-+++ mod_perl-2.0.6/src/modules/perl/modperl_perl.c	2012-05-26 21:55:39.000000000 +0300
-@@ -102,13 +102,4 @@ static void modperl_perl_init_ids(pTHX_
-     sv_setiv(GvSV(gv_fetchpv("$", TRUE, SVt_PV)), ids->pid);
- 
--#ifndef WIN32
--    PL_uid  = ids->uid;
--    PL_euid = ids->euid;
--    PL_gid  = ids->gid;
--    PL_egid = ids->egid;
--#endif
--#ifdef MP_MAINTAIN_PPID
--    PL_ppid = ids->ppid;
--#endif
- }
- 
diff --git a/extra/mod_perl/nolfs.patch b/extra/mod_perl/nolfs.patch
deleted file mode 100644
index 3eb345b66..000000000
--- a/extra/mod_perl/nolfs.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: mod_perl-2.0.5/lib/Apache2/Build.pm
-===================================================================
---- mod_perl-2.0.5.orig/lib/Apache2/Build.pm	2011-02-02 21:23:47.000000000 +0100
-+++ mod_perl-2.0.5/lib/Apache2/Build.pm	2011-05-26 17:12:46.276946520 +0200
-@@ -2147,7 +2147,8 @@ sub has_large_files_conflict {
-     # with it is that we didn't have such a case yet, but may need to
-     # deal with it later
- 
--    return $perl_lfs64 ^ $apr_lfs64;
-+    return 0;
-+    # $perl_lfs64 ^ $apr_lfs64;
- }
- 
- # if perl is built with uselargefiles, but apr not, the build won't
diff --git a/extra/vlc/access_smb_link_to_smbclient.patch b/extra/vlc/access_smb_link_to_smbclient.patch
deleted file mode 100644
index 3891108d4..000000000
--- a/extra/vlc/access_smb_link_to_smbclient.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-X-Git-Url: http://git.videolan.org/?p=vlc.git;a=blobdiff_plain;f=modules%2Faccess%2FModules.am;h=be8c47b8fee03e5f4fc42c61b8e13f2d6ad587df;hp=81d8e78edc214026ceff3b17996b7bdbc47b3c26;hb=718b1f9901e5077b50c2189604afba883ca87bf7;hpb=84a1a3461adf901ff134a09eb4341cc301fdc6dd
-
-diff --git a/modules/access/Modules.am b/modules/access/Modules.am
-index 81d8e78..be8c47b 100644
---- a/modules/access/Modules.am
-+++ b/modules/access/Modules.am
-@@ -36,7 +36,7 @@ libsdp_plugin_la_DEPENDENCIES =
- 
- libaccess_smb_plugin_la_SOURCES = smb.c
- libaccess_smb_plugin_la_CFLAGS = $(AM_CFLAGS)
--libaccess_smb_plugin_la_LIBADD = $(AM_LIBADD)
-+libaccess_smb_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_access_smb)
- if HAVE_WIN32
- libaccess_smb_plugin_la_LIBADD += -lmpr
- endif
diff --git a/extra/xournal/pdf-export-64.patch b/extra/xournal/pdf-export-64.patch
deleted file mode 100644
index 9f7075c54..000000000
--- a/extra/xournal/pdf-export-64.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff -aur old/src/xo-print.c new/src/xo-print.c
---- old/src/xo-print.c	2009-09-28 23:36:54.000000000 +0200
-+++ new/src/xo-print.c	2009-11-15 06:06:00.000000000 +0100
-@@ -761,7 +761,7 @@
- 
-   make_xref(xref, xref->last+1, pdfbuf->len);
-   g_string_append_printf(pdfbuf, 
--    "%d 0 obj\n<< /Length %d /Filter /FlateDecode /Type /Xobject "
-+    "%d 0 obj\n<< /Length %zu /Filter /FlateDecode /Type /Xobject "
-     "/Subtype /Image /Width %d /Height %d /ColorSpace /DeviceRGB "
-     "/BitsPerComponent 8 >> stream\n",
-     xref->last, zpix->len, width, height);
-@@ -840,8 +840,10 @@
-   gboolean fallback, is_binary;
-   guchar encoding[256];
-   gushort glyphs[256];
--  int i, j, num, len1, len2;
--  gsize len;
-+  int i, j, num;
-+  guint32 len1, len2;
-+  guint32 tt_len;
-+  gsize t1_len;
-   TrueTypeFont *ttfnt;
-   char *seg1, *seg2;
-   char *fontdata, *p;
-@@ -862,14 +864,14 @@
-       }
-     font->num_glyphs_used = num-1;
-     if (OpenTTFont(font->filename, 0, &ttfnt) == SF_OK) {
--      if (CreateTTFromTTGlyphs_tomemory(ttfnt, (guint8**)&fontdata, &len, glyphs, encoding, num, 
-+      if (CreateTTFromTTGlyphs_tomemory(ttfnt, (guint8**)&fontdata, &tt_len, glyphs, encoding, num, 
-                    0, NULL, TTCF_AutoName | TTCF_IncludeOS2) == SF_OK) {
-         make_xref(xref, xref->last+1, pdfbuf->len);
-         nobj_fontprog = xref->last;
-         g_string_append_printf(pdfbuf, 
--          "%d 0 obj\n<< /Length %d /Length1 %d >> stream\n",
--          nobj_fontprog, (int)len, (int)len);
--        g_string_append_len(pdfbuf, fontdata, len);
-+          "%d 0 obj\n<< /Length %u /Length1 %u >> stream\n",
-+          nobj_fontprog, tt_len, tt_len);
-+        g_string_append_len(pdfbuf, fontdata, tt_len);
-         g_string_append(pdfbuf, "endstream\nendobj\n");
-         g_free(fontdata);
-       }
-@@ -879,7 +881,7 @@
-     else fallback = TRUE;
-   } else {
-   // embed the font file: Type1 case
--    if (g_file_get_contents(font->filename, &fontdata, &len, NULL) && len>=8) {
-+    if (g_file_get_contents(font->filename, &fontdata, &t1_len, NULL) && t1_len>=8) {
-       if (fontdata[0]==(char)0x80 && fontdata[1]==(char)0x01) {
-         is_binary = TRUE;
-         len1 = pfb_get_length((unsigned char *)fontdata+2);
-@@ -898,7 +900,7 @@
-           if (*p=='\n' || *p=='\r') p++;
-           if (*p=='\n' || *p=='\r') p++;
-           len1 = p-fontdata;
--          p = g_strrstr_len(fontdata, len, T1_SEGMENT_3_END);
-+          p = g_strrstr_len(fontdata, t1_len, T1_SEGMENT_3_END);
-           if (p==NULL) fallback = TRUE;
-           else {
-             // rewind 512 zeros
-@@ -936,7 +938,7 @@
-         make_xref(xref, xref->last+1, pdfbuf->len);
-         nobj_fontprog = xref->last;
-         g_string_append_printf(pdfbuf, 
--          "%d 0 obj\n<< /Length %d /Length1 %d /Length2 %d /Length3 0 >> stream\n",
-+          "%d 0 obj\n<< /Length %u /Length1 %u /Length2 %u /Length3 0 >> stream\n",
-           nobj_fontprog, len1+len2, len1, len2);
-         g_string_append_len(pdfbuf, seg1, len1);
-         g_string_append_len(pdfbuf, seg2, len2);
-@@ -1258,7 +1260,7 @@
-       tmpstr = make_pdfprefix(pdfinfo.pages+(pg->bg->file_page_seq-1),
-                               pg->width, pg->height);
-       g_string_append_printf(pdfbuf,
--        "%d 0 obj\n<< /Length %d >> stream\n%s\nendstream\nendobj\n",
-+        "%d 0 obj\n<< /Length %zu >> stream\n%s\nendstream\nendobj\n",
-         n_obj_prefix, tmpstr->len, tmpstr->str);
-       g_string_free(tmpstr, TRUE);
-       g_string_prepend(pgstrm, "Q Q Q ");
-@@ -1276,7 +1278,7 @@
-     
-     make_xref(&xref, xref.last+1, pdfbuf->len);
-     g_string_append_printf(pdfbuf, 
--      "%d 0 obj\n<< /Length %d /Filter /FlateDecode>> stream\n",
-+      "%d 0 obj\n<< /Length %zu /Filter /FlateDecode>> stream\n",
-       xref.last, zpgstrm->len);
-     g_string_append_len(pdfbuf, zpgstrm->str, zpgstrm->len);
-     g_string_free(zpgstrm, TRUE);
diff --git a/extra/xournal/poppler-api.patch b/extra/xournal/poppler-api.patch
deleted file mode 100644
index 9e33c7feb..000000000
--- a/extra/xournal/poppler-api.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-diff -aur old/src/xo-file.c new/src/xo-file.c
---- old/src/xo-file.c	2009-09-29 09:36:05.000000000 +1000
-+++ new/src/xo-file.c	2011-10-06 03:11:17.307822836 +1100
-@@ -975,6 +975,140 @@
-   g_free(req);
- }
- 
-+/*
-+ * Copied from http://cgit.freedesktop.org/poppler/poppler/tree/glib/poppler-page.cc?h=poppler-0.16#n617
-+ * as a temporary workaround to poppler removing depreciated functions while we wait for
-+ * upstream to rewrite against cairo
-+ */
-+static void
-+copy_cairo_surface_to_pixbuf (cairo_surface_t *surface, GdkPixbuf *pixbuf)
-+{
-+  int cairo_width, cairo_height, cairo_rowstride;
-+  unsigned char *pixbuf_data, *dst, *cairo_data;
-+  int pixbuf_rowstride, pixbuf_n_channels;
-+  unsigned int *src;
-+  int x, y;
-+
-+  cairo_width = cairo_image_surface_get_width (surface);
-+  cairo_height = cairo_image_surface_get_height (surface);
-+  cairo_rowstride = cairo_image_surface_get_stride (surface);
-+  cairo_data = cairo_image_surface_get_data (surface);
-+
-+  pixbuf_data = gdk_pixbuf_get_pixels (pixbuf);
-+  pixbuf_rowstride = gdk_pixbuf_get_rowstride (pixbuf);
-+  pixbuf_n_channels = gdk_pixbuf_get_n_channels (pixbuf);
-+
-+  if (cairo_width > gdk_pixbuf_get_width (pixbuf))
-+    cairo_width = gdk_pixbuf_get_width (pixbuf);
-+  if (cairo_height > gdk_pixbuf_get_height (pixbuf))
-+    cairo_height = gdk_pixbuf_get_height (pixbuf);
-+  for (y = 0; y < cairo_height; y++)
-+    {
-+      src = (unsigned int *) (cairo_data + y * cairo_rowstride);
-+      dst = pixbuf_data + y * pixbuf_rowstride;
-+      for (x = 0; x < cairo_width; x++)
-+	{
-+	  dst[0] = (*src >> 16) & 0xff;
-+	  dst[1] = (*src >> 8) & 0xff;
-+	  dst[2] = (*src >> 0) & 0xff;
-+	  if (pixbuf_n_channels == 4)
-+	      dst[3] = (*src >> 24) & 0xff;
-+	  dst += pixbuf_n_channels;
-+	  src++;
-+	}
-+    }
-+}
-+
-+static void
-+_poppler_page_render_to_pixbuf (PopplerPage *page,
-+				int src_x, int src_y,
-+				int src_width, int src_height,
-+				double scale,
-+				int rotation,
-+				gboolean printing,
-+				GdkPixbuf *pixbuf)
-+{
-+  cairo_t *cr;
-+  cairo_surface_t *surface;
-+
-+  surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
-+					src_width, src_height);
-+  cr = cairo_create (surface);
-+  cairo_save (cr);
-+  switch (rotation) {
-+  case 90:
-+	  cairo_translate (cr, src_x + src_width, -src_y);
-+	  break;
-+  case 180:
-+	  cairo_translate (cr, src_x + src_width, src_y + src_height);
-+	  break;
-+  case 270:
-+	  cairo_translate (cr, -src_x, src_y + src_height);
-+	  break;
-+  default:
-+	  cairo_translate (cr, -src_x, -src_y);
-+  }
-+
-+  if (scale != 1.0)
-+	  cairo_scale (cr, scale, scale);
-+
-+  if (rotation != 0)
-+	  cairo_rotate (cr, rotation * G_PI / 180.0);
-+
-+  if (printing)
-+	  poppler_page_render_for_printing (page, cr);
-+  else
-+	  poppler_page_render (page, cr);
-+  cairo_restore (cr);
-+
-+  cairo_set_operator (cr, CAIRO_OPERATOR_DEST_OVER);
-+  cairo_set_source_rgb (cr, 1., 1., 1.);
-+  cairo_paint (cr);
-+
-+  cairo_destroy (cr);
-+
-+  copy_cairo_surface_to_pixbuf (surface, pixbuf);
-+  cairo_surface_destroy (surface);
-+}
-+
-+/**
-+ * poppler_page_render_to_pixbuf:
-+ * @page: the page to render from
-+ * @src_x: x coordinate of upper left corner
-+ * @src_y: y coordinate of upper left corner
-+ * @src_width: width of rectangle to render
-+ * @src_height: height of rectangle to render
-+ * @scale: scale specified as pixels per point
-+ * @rotation: rotate the document by the specified degree
-+ * @pixbuf: pixbuf to render into
-+ *
-+ * First scale the document to match the specified pixels per point,
-+ * then render the rectangle given by the upper left corner at
-+ * (src_x, src_y) and src_width and src_height.
-+ * This function is for rendering a page that will be displayed.
-+ * If you want to render a page that will be printed use
-+ * poppler_page_render_to_pixbuf_for_printing() instead
-+ *
-+ * Deprecated: 0.16
-+ **/
-+void
-+poppler_page_render_to_pixbuf (PopplerPage *page,
-+			       int src_x, int src_y,
-+			       int src_width, int src_height,
-+			       double scale,
-+			       int rotation,
-+			       GdkPixbuf *pixbuf)
-+{
-+  g_return_if_fail (POPPLER_IS_PAGE (page));
-+  g_return_if_fail (scale > 0.0);
-+  g_return_if_fail (pixbuf != NULL);
-+
-+  _poppler_page_render_to_pixbuf (page, src_x, src_y,
-+				  src_width, src_height,
-+				  scale, rotation,
-+				  FALSE,
-+				  pixbuf);
-+}
- /* process a bg PDF request from the queue, and recurse */
- 
- gboolean bgpdf_scheduler_callback(gpointer data)
-diff -aur old/src/xo-file.h new/src/xo-file.h
---- old/src/xo-file.h	2009-09-28 08:45:53.000000000 +1000
-+++ new/src/xo-file.h	2011-10-06 03:11:17.311156160 +1100
-@@ -36,3 +36,10 @@
- void init_config_default(void);
- void load_config_from_file(void);
- void save_config_to_file(void);
-+
-+void poppler_page_render_to_pixbuf (PopplerPage *page,
-+					       int src_x, int src_y,
-+					       int src_width, int src_height,
-+					       double scale,
-+					       int rotation,
-+					       GdkPixbuf *pixbuf);