diff options
| author | albator <albator@arcadia.vtf> | 2011-11-24 23:49:17 +0100 |
|---|---|---|
| committer | albator <albator@arcadia.vtf> | 2011-11-24 23:49:17 +0100 |
| commit | 90b1878f91678caf4483ee7040f2cccff094ba21 (patch) | |
| tree | 436551db4f7e03f7da5fb3f576338ba22af7c7a2 /redhat | |
| parent | b90c8995428a95728d62ad0f1b477d2486654212 (diff) | |
| download | tde-packaging-90b1878f91678caf4483ee7040f2cccff094ba21.tar.gz tde-packaging-90b1878f91678caf4483ee7040f2cccff094ba21.zip | |
RHEL/Fedora: some patches
Diffstat (limited to 'redhat')
3 files changed, 72 insertions, 0 deletions
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.12-qtinterface-makefile.patch b/redhat/dependencies/tqtinterface/tqtinterface-3.5.12-qtinterface-makefile.patch new file mode 100644 index 000000000..687aef612 --- /dev/null +++ b/redhat/dependencies/tqtinterface/tqtinterface-3.5.12-qtinterface-makefile.patch @@ -0,0 +1,19 @@ +*** tqtinterface/qtinterface/Makefile.am.ORI 2011-09-16 20:05:43.000000000 +0200 +--- tqtinterface/qtinterface/Makefile.am 2011-09-16 20:05:54.000000000 +0200 +*************** +*** 150,156 **** + endif + + install-exec-local: +! test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" + cp -Rp "$(srcdir)/tqt-replace" "$(DESTDIR)$(bindir)/" + cp -Rp "$(srcdir)/tqt-replace-stream" "$(DESTDIR)$(bindir)/" + cp -Rp "$(srcdir)/moc-tqt" "$(DESTDIR)$(bindir)/" +--- 150,156 ---- + endif + + install-exec-local: +! test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" + cp -Rp "$(srcdir)/tqt-replace" "$(DESTDIR)$(bindir)/" + cp -Rp "$(srcdir)/tqt-replace-stream" "$(DESTDIR)$(bindir)/" + cp -Rp "$(srcdir)/moc-tqt" "$(DESTDIR)$(bindir)/" diff --git a/redhat/kdegraphics/kdebase-3.5.13-poppler_tqt_ftbfs.patch b/redhat/kdegraphics/kdebase-3.5.13-poppler_tqt_ftbfs.patch new file mode 100644 index 000000000..9c3118bbf --- /dev/null +++ b/redhat/kdegraphics/kdebase-3.5.13-poppler_tqt_ftbfs.patch @@ -0,0 +1,13 @@ +--- kdegraphics/kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt.ORI 2011-11-22 16:56:38.608230401 -0500 ++++ kdegraphics/kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt 2011-11-22 16:56:57.829811773 -0500 +@@ -21,6 +21,10 @@ + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${CMAKE_SOURCE_DIR}/kfile-plugins/dependencies/poppler-tqt ++ ${CMAKE_SOURCE_DIR}/kpdf/xpdf/xpdf ++ ${CMAKE_SOURCE_DIR}/kpdf/xpdf ++ ${CMAKE_SOURCE_DIR}/kpdf/xpdf/goo ++ ${CMAKE_SOURCE_DIR}/kpdf/xpdf/splash + /usr/include/poppler + ) + diff --git a/redhat/kdelibs/kdelibs-3.5.13-maxlinelength.patch b/redhat/kdelibs/kdelibs-3.5.13-maxlinelength.patch new file mode 100644 index 000000000..ba009c708 --- /dev/null +++ b/redhat/kdelibs/kdelibs-3.5.13-maxlinelength.patch @@ -0,0 +1,40 @@ +diff -Naur kdelibs.orig/kio/kio/kmimemagic.cpp kdelibs/kio/kio/kmimemagic.cpp +--- kdelibs.orig/kio/kio/kmimemagic.cpp 2011-08-11 04:30:08.000000000 +0200 ++++ kdelibs/kio/kio/kmimemagic.cpp 2011-11-19 23:23:41.000000000 +0100 +@@ -1988,8 +1988,9 @@ + return 1; + } + +-/* Maximal length of a line we consider "reasonable". */ +-#define TEXT_MAXLINELEN 300 ++/* Code removed below: conf files with big lines ARE text files, ++ * there is no "reasonable" length ++ */ + + // This code is taken from the "file" command, where it is licensed + // in the "beer-ware license" :-) +@@ -2007,23 +2008,6 @@ + if ((*cp < 8) || (*cp>13 && *cp<32 && *cp!=27 ) || (*cp==0x7F)) + return 0; + +- /* Now, look whether the file consists of lines of +- * "reasonable" length. */ +- +- for (i = 0; i < nbytes;) { +- cp = (unsigned char *) memchr(buf, '\n', nbytes - i); +- if (cp == NULL) { +- /* Don't fail if we hit the end of buffer. */ +- if (i + TEXT_MAXLINELEN >= nbytes) +- break; +- else +- return 0; +- } +- if (cp - buf > TEXT_MAXLINELEN) +- return 0; +- i += (cp - buf + 1); +- buf = cp + 1; +- } + conf->resultBuf = MIME_TEXT_PLAIN; + return 1; + } + |