summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /app-arch/advancecomp/files
downloadgentoo-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 'app-arch/advancecomp/files')
-rw-r--r--app-arch/advancecomp/files/advancecomp-1.13-bzip2-compile-plz-k-thx.diff61
-rw-r--r--app-arch/advancecomp/files/advancecomp-1.17-bzip2-compile.patch16
2 files changed, 77 insertions, 0 deletions
diff --git a/app-arch/advancecomp/files/advancecomp-1.13-bzip2-compile-plz-k-thx.diff b/app-arch/advancecomp/files/advancecomp-1.13-bzip2-compile-plz-k-thx.diff
new file mode 100644
index 000000000000..f20bba3373a2
--- /dev/null
+++ b/app-arch/advancecomp/files/advancecomp-1.13-bzip2-compile-plz-k-thx.diff
@@ -0,0 +1,61 @@
+--- advancecomp-1.13.orig/compress.cc 2004-12-16 23:19:17.779774920 -0200
++++ advancecomp-1.13/compress.cc 2004-12-16 23:36:05.356599960 -0200
+@@ -181,16 +181,17 @@
+ }
+
+ #if USE_BZIP2
+-bool compress_bzip2(const unsigned char* in_data, unsigned in_size, unsigned char* out_data, unsigned& out_size, int blocksize, int workfactor)
++
++bool compress_bzip2(const char* in_data, unsigned in_size, char* out_data, unsigned& out_size, int blocksize, int workfactor)
+ {
+- return BZ2_bzBuffToBuffCompress(out_data, &out_size, const_cast<unsigned char*>(in_data), in_size, blocksize, 0, workfactor) == BZ_OK;
++ return BZ2_bzBuffToBuffCompress(out_data,&out_size,const_cast<char*>(in_data),in_size,blocksize,0,workfactor) == BZ_OK;
+ }
+
+-bool decompress_bzip2(const unsigned char* in_data, unsigned in_size, unsigned char* out_data, unsigned out_size)
++bool decompress_bzip2(const char* in_data, unsigned in_size, char* out_data, unsigned out_size)
+ {
+ unsigned size = out_size;
+
+- if (BZ2_bzBuffToBuffDecompress(out_data, &size, const_cast<unsigned char*>(in_data), in_size, 0, 0)!=BZ_OK)
++ if (BZ2_bzBuffToBuffDecompress(out_data,&size,const_cast< char*>(in_data),in_size,0,0)!=BZ_OK)
+ return false;
+
+ if (size != out_size)
+--- advancecomp-1.13.orig/compress.h 2004-12-16 23:19:17.778775072 -0200
++++ advancecomp-1.13/compress.h 2004-12-16 23:37:00.178265800 -0200
+@@ -37,8 +37,8 @@
+ bool decompress_deflate_zlib(const unsigned char* in_data, unsigned in_size, unsigned char* out_data, unsigned out_size);
+ bool compress_deflate_zlib(const unsigned char* in_data, unsigned in_size, unsigned char* out_data, unsigned& out_size, int compression_level, int strategy, int mem_level);
+
+-bool decompress_bzip2(const unsigned char* in_data, unsigned in_size, unsigned char* out_data, unsigned out_size);
+-bool compress_bzip2(const unsigned char* in_data, unsigned in_size, unsigned char* out_data, unsigned& out_size, int blocksize, int workfactor);
++bool decompress_bzip2(const char* in_data, unsigned in_size, char* out_data, unsigned out_size);
++bool compress_bzip2(const char* in_data, unsigned in_size, char* out_data, unsigned& out_size, int blocksize, int workfactor);
+
+ bool decompress_rfc1950_zlib(const unsigned char* in_data, unsigned in_size, unsigned char* out_data, unsigned out_size);
+ bool compress_rfc1950_zlib(const unsigned char* in_data, unsigned in_size, unsigned char* out_data, unsigned& out_size, int compression_level, int strategy, int mem_level);
+--- advancecomp-1.13.orig/stamp-h1 1969-12-31 21:00:00.000000000 -0300
++++ advancecomp-1.13/stamp-h1 2004-12-16 23:37:46.906162080 -0200
+@@ -0,0 +1 @@
++timestamp for config.h
+--- advancecomp-1.13.orig/zipsh.cc 2004-12-16 23:19:17.779774920 -0200
++++ advancecomp-1.13/zipsh.cc 2004-12-16 23:39:30.099474312 -0200
+@@ -39,7 +39,7 @@
+ }
+ #ifdef USE_BZIP2
+ } else if (info.compression_method == ZIP_METHOD_BZIP2) {
+- if (!decompress_bzip2(data, compressed_size_get(), uncompressed_data, uncompressed_size_get())) {
++ if (!decompress_bzip2((char *)data,compressed_size_get(),(char *)uncompressed_data,uncompressed_size_get())) {
+ throw error_invalid() << "Invalid compressed data on file " << name_get();
+ }
+ #endif
+@@ -247,7 +247,7 @@
+ c1_met = ZIP_METHOD_BZIP2;
+ c1_fla = 0;
+
+- if (!compress_bzip2(uncompressed_data, uncompressed_size_get(), c1_data, c1_size, bzip2_level, bzip2_workfactor)) {
++ if (!compress_bzip2((char *)uncompressed_data,uncompressed_size_get(),(char *)c1_data,c1_size,bzip2_level,bzip2_workfactor)) {
+ data_free(c1_data);
+ c1_data = 0;
+ }
diff --git a/app-arch/advancecomp/files/advancecomp-1.17-bzip2-compile.patch b/app-arch/advancecomp/files/advancecomp-1.17-bzip2-compile.patch
new file mode 100644
index 000000000000..726c63cf532d
--- /dev/null
+++ b/app-arch/advancecomp/files/advancecomp-1.17-bzip2-compile.patch
@@ -0,0 +1,16 @@
+--- advancecomp-1.17/zipsh.cc
++++ advancecomp-1.17/zipsh.cc
+@@ -215,11 +215,11 @@
+ }
+
+ #if USE_BZIP2
+- if (level != shrink_fast && !standard) {
++ if (level.level != shrink_fast && !standard) {
+ unsigned bzip2_level;
+ unsigned bzip2_workfactor;
+
+- switch (level) {
++ switch (level.level) {
+ case shrink_normal :
+ bzip2_level = 6;
+ bzip2_workfactor = 30;