diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /www-misc/htdig/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'www-misc/htdig/files')
-rw-r--r-- | www-misc/htdig/files/htdig-3.2.0_beta6-as-needed.patch | 61 | ||||
-rw-r--r-- | www-misc/htdig/files/htdig-3.2.0_beta6-gcc4.patch | 15 | ||||
-rw-r--r-- | www-misc/htdig/files/htdig-3.2.0_beta6-quoting.patch | 26 |
3 files changed, 102 insertions, 0 deletions
diff --git a/www-misc/htdig/files/htdig-3.2.0_beta6-as-needed.patch b/www-misc/htdig/files/htdig-3.2.0_beta6-as-needed.patch new file mode 100644 index 000000000000..bf455ea8b637 --- /dev/null +++ b/www-misc/htdig/files/htdig-3.2.0_beta6-as-needed.patch @@ -0,0 +1,61 @@ +--- htdig-3.2.0b6/Makefile.config.orig 2006-11-19 08:49:57.000000000 -0800 ++++ htdig-3.2.0b6/Makefile.config 2006-11-19 08:51:19.000000000 -0800 +@@ -22,10 +22,7 @@ + $(LOCAL_DEFINES) $(PROFILING) + + HTLIBS= $(top_builddir)/htnet/libhtnet.la \ +- $(top_builddir)/htcommon/libcommon.la \ +- $(top_builddir)/htword/libhtword.la \ + $(top_builddir)/htlib/libht.la \ + $(top_builddir)/htcommon/libcommon.la \ + $(top_builddir)/htword/libhtword.la \ +- $(top_builddir)/db/libhtdb.la \ +- $(top_builddir)/htlib/libht.la ++ $(top_builddir)/db/libhtdb.la +--- htdig-3.2.0b6/htlib/Makefile.am.orig 2006-11-19 09:13:47.000000000 -0800 ++++ htdig-3.2.0b6/htlib/Makefile.am 2006-11-19 09:17:50.000000000 -0800 +@@ -1,7 +1,8 @@ + include $(top_srcdir)/Makefile.config + + pkglib_LTLIBRARIES = libht.la +- ++libht_la_DEPENDENCIES = $(top_builddir)/db/libhtdb.la ++libht_la_LIBADD= $(top_builddir)/db/libhtdb.la + libht_la_SOURCES = Configuration.cc Database.cc Dictionary.cc \ + DB2_db.cc IntObject.cc List.cc Object.cc \ + ParsedString.cc Queue.cc QuotedStringList.cc Stack.cc \ +@@ -17,9 +18,6 @@ + myqsort.c \ + md5.cc mhash_md5.c + +-libht_la_LIBADD=@LTLIBOBJS@ +-# this includes regex.c +- + libht_la_LDFLAGS = -release $(HTDIG_MAJOR_VERSION).$(HTDIG_MINOR_VERSION).$(HTDIG_MICRO_VERSION) ${extra_ldflags} + + pkginclude_HEADERS = \ +--- htdig-3.2.0b6/htword/Makefile.am.orig 2006-11-19 08:55:08.000000000 -0800 ++++ htdig-3.2.0b6/htword/Makefile.am 2006-11-19 08:56:51.000000000 -0800 +@@ -10,7 +10,8 @@ + LOCAL_DEFINES = + + pkglib_LTLIBRARIES = libhtword.la +- ++libhtword_la_DEPENDENCIES = $(top_builddir)/htlib/libht.la ++libhtword_la_LIBADD = $(top_builddir)/htlib/libht.la + libhtword_la_SOURCES = \ + WordBitCompress.cc \ + WordContext.cc \ + +--- htdig-3.2.0b6/htcommon/Makefile.am.orig 2006-11-19 09:32:39.000000000 -0800 ++++ htdig-3.2.0b6/htcommon/Makefile.am 2006-11-19 09:33:42.000000000 -0800 +@@ -12,7 +12,8 @@ + EXTRA_DIST=conf_lexer.cxx conf_parser.cxx + + pkglib_LTLIBRARIES = libcommon.la +- ++libcommon_la_DEPENDENCIES = $(top_builddir)/htword/libhtword.la ++libcommon_la_LIBADD = $(top_builddir)/htword/libhtword.la + libcommon_la_SOURCES = DocumentDB.cc DocumentRef.cc \ + HtWordReference.cc HtWordList.cc defaults.cc \ + HtURLCodec.cc URL.cc URLTrans.cc \ diff --git a/www-misc/htdig/files/htdig-3.2.0_beta6-gcc4.patch b/www-misc/htdig/files/htdig-3.2.0_beta6-gcc4.patch new file mode 100644 index 000000000000..58dec13957e2 --- /dev/null +++ b/www-misc/htdig/files/htdig-3.2.0_beta6-gcc4.patch @@ -0,0 +1,15 @@ +diff -Naurp htdig-3.2.0b6.orig/htsearch/Collection.h htdig-3.2.0b6/htsearch/Collection.h +--- htdig-3.2.0b6.orig/htsearch/Collection.h 2004-05-28 06:15:24.000000000 -0700 ++++ htdig-3.2.0b6/htsearch/Collection.h 2006-03-22 11:35:40.000000000 -0800 +@@ -36,9 +36,9 @@ public: + const char *docExcerpt); + ~Collection(); + +- void Collection::Open(); ++ void Open(); + +- void Collection::Close(); ++ void Close(); + + char *getWordFile() { return wordFile.get(); } + DocumentRef *getDocumentRef(int id); diff --git a/www-misc/htdig/files/htdig-3.2.0_beta6-quoting.patch b/www-misc/htdig/files/htdig-3.2.0_beta6-quoting.patch new file mode 100644 index 000000000000..57b0e3b78731 --- /dev/null +++ b/www-misc/htdig/files/htdig-3.2.0_beta6-quoting.patch @@ -0,0 +1,26 @@ +Index: htdig-3.2.0b6/htsearch/Display.cc +=================================================================== +--- htdig-3.2.0b6.orig/htsearch/Display.cc ++++ htdig-3.2.0b6/htsearch/Display.cc +@@ -137,7 +137,7 @@ Display::display(int pageNumber) + // Must temporarily stash the message in a String, since + // displaySyntaxError will overwrite the static temp used in form. + +- String s(form("No such sort method: `%s'", (const char*)config->Find("sort"))); ++ String s("invalid sort method"); + + displaySyntaxError(s); + return; +Index: htdig-3.2.0b6/libhtdig/ResultFetch.cc +=================================================================== +--- htdig-3.2.0b6.orig/libhtdig/ResultFetch.cc ++++ htdig-3.2.0b6/libhtdig/ResultFetch.cc +@@ -142,7 +142,7 @@ ResultFetch::fetch() + // Must temporarily stash the message in a String, since + // displaySyntaxError will overwrite the static temp used in form. + +- String s(form("No such sort method: `%s'", (const char *) config->Find("sort"))); ++ String s("invalid sort method"); + + displaySyntaxError(s); + //return; |