RHEL/Fedora: some patches

pull/3/head
albator 13 years ago
parent b90c899542
commit 90b1878f91

@ -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)/"

@ -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
)

@ -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;
}
Loading…
Cancel
Save