From c4c4131bf6ef11a4e6ac5d1e854316bd8ad6c69d Mon Sep 17 00:00:00 2001 From: D Haley Date: Nov 25 2012 02:29:41 +0000 Subject: * Upadage patches and sources --- diff --git a/.gitignore b/.gitignore index d4d1eb3..bd23a88 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /3Depict-0.0.9.tar.gz /3Depict-0.0.10.tar.gz /3Depict-0.0.11.tar.gz +/3Depict-0.0.12.tar.gz diff --git a/3Depict-0.0.12-font-path.patch b/3Depict-0.0.12-font-path.patch new file mode 100644 index 0000000..70252ee --- /dev/null +++ b/3Depict-0.0.12-font-path.patch @@ -0,0 +1,11 @@ +diff -r dfc04b8b14b2 src/wxcomponents.cpp +--- src/wxcomponents.cpp Fri May 20 22:26:38 2011 +0100 ++++ src/wxcomponents.cpp Fri May 20 22:27:00 2011 +0100 +@@ -666,6 +666,7 @@ + //This is a list of possible target dirs to search + //(Oh look Ma, I'm autoconf!) + const char *dirs[] = { ".", ++ "/usr/share/fonts/dejavu", //Fedora + "/usr/share/fonts/truetype", + "/usr/local/share/fonts/truetype", + "/usr/X11R6/lib/X11/fonts/truetype", diff --git a/3Depict-0.0.12-manual-pdf-loc.patch b/3Depict-0.0.12-manual-pdf-loc.patch new file mode 100644 index 0000000..a819a9c --- /dev/null +++ b/3Depict-0.0.12-manual-pdf-loc.patch @@ -0,0 +1,16 @@ +diff -r 634db475333f src/3Depict.cpp +--- src/3Depict.cpp Sun Oct 23 17:43:37 2011 +0100 ++++ src/3Depict.cpp Sun Oct 23 17:44:33 2011 +0100 +@@ -2142,9 +2142,9 @@ + string s; + s=locateDataFile("3Depict-manual.pdf"); + +- //Also Debian makes us use the lowercase "D", so check there too. +- if(!s.size()) +- s=locateDataFile("3depict-manual.pdf"); ++ //Also Fedora has diff dir ++ if(!wxFileExists(wxStr(s))) ++ s="/usr/share/doc/3Depict-0.0.8/3Depict-0.0.8-manual.pdf"; + + + //If we found it, use the default program associated with that data file diff --git a/3Depict-0.0.12-png-gray.patch b/3Depict-0.0.12-png-gray.patch new file mode 100644 index 0000000..5c0e793 --- /dev/null +++ b/3Depict-0.0.12-png-gray.patch @@ -0,0 +1,15 @@ +diff -r src/pngread.c src/pngread.c +--- src/pngread.c ++++ src/pngread.c +@@ -132,11 +132,7 @@ int read_png(FILE *fp, unsigned int sig_read, png_bytep **row_pointers, + /* Expand grayscale images to the full 8 bits from 1, 2, or 4 bits/pixel */ + if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) + { +-#if defined(__APPLE__) || defined(__WIN32) || defined(__WIN64) + png_set_expand_gray_1_2_4_to_8(png_ptr); +-#else +- png_set_gray_1_2_4_to_8(png_ptr); +-#endif + } + + /* Expand paletted or RGB images with transparency to full alpha for RGBA */ diff --git a/sources b/sources index 3697173..ef31ff4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b6b1efb6cb0b3df6a428e5b24c341672 3Depict-0.0.11.tar.gz +bb97ab7e9d64030f3e3050370fa841c9 3Depict-0.0.12.tar.gz