haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-05 14:38:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'package-management'

Browse Source 
Conflicts:
	app-arch/p7zip/p7zip-9.04.bep
	app-arch/p7zip/p7zip-9.13.bep
	app-arch/tar/tar-1.22.bep
	app-arch/tar/tar-1.23.bep
	app-arch/tar/tar-1.25.bep
	app-arch/xz-utils/xz-utils-4.999.9.bep
	app-cdr/bchunk/bchunk-1.2.0.bep
	app-cdr/cdrtools/cdrtools-2.01.01a66.bep
	app-cdr/cdrtools/cdrtools-3.01a01.bep
	app-crypt/gnupg/gnupg-1.4.11.bep
	app-doc/doxygen/doxygen-1.6.3.bep
	app-editors/nano/nano-2.2.6.bep
	app-editors/vim/vim-7.3.bep
	app-text/antiword/antiword-0.37.bep
	app-text/libpaper/libpaper-1.1.23.bep
	app-text/libpaper/libpaper-1.1.24.bep
	app-text/rman/rman-3.2.bep
	dev-db/sqlite/sqlite-3.6.22.bep
	dev-db/sqlite/sqlite-3.6.23.bep
	dev-db/sqlite/sqlite-3.7.2.bep
	dev-db/sqlite/sqlite-3.7.3.bep
	dev-db/sqlite/sqlite-3.7.4.bep
	dev-db/sqlite/sqlite-3.7.5.bep
	dev-lang/lua/lua-5.1.4.bep
	dev-lang/nasm/nasm-2.08.01.bep
	dev-lang/perl/patches/perl-5.10.0.patch
	dev-lang/python/python-2.5.4.bep
	dev-lang/python/python-2.6.4.bep
	dev-lang/python/python-2.6.5.bep
	dev-lang/python/python-2.6.6.bep
	dev-lang/python/python-2.6.7.bep
	dev-lang/python/python-2.6.8.bep
	dev-lang/python/python-3.2.bep
	dev-lang/python/python-3.2.recipe
	dev-lang/python/python-3.2a4.bep
	dev-lang/yasm/yasm-1.1.0.bep
	dev-libs/apr-util/apr-util-1.3.10.bep
	dev-libs/apr-util/apr-util-1.3.9.bep
	dev-libs/apr/apr-1.3.8.bep
	dev-libs/apr/apr-1.3.9.bep
	dev-libs/apr/apr-1.4.2.bep
	dev-libs/apr/patches/apr-1.4.2.patch
	dev-libs/expat/expat-2.0.1.bep
	dev-libs/fribidi/fribidi-0.19.2.bep
	dev-libs/icu/icu-4.4.1.bep
	dev-libs/libedit/libedit-20090923.bep
	dev-libs/libedit/libedit-20100424.bep
	dev-libs/libevent/libevent-1.4.11.bep
	dev-libs/libevent/libevent-1.4.13.bep
	dev-libs/libevent/libevent-1.4.14b.bep
	dev-libs/libevent/libevent-2.0.10.bep
	dev-libs/libiconv/libiconv-1.12.bep
	dev-libs/libiconv/libiconv-1.13.1.bep
	dev-libs/libpcre/libpcre-8.00.bep
	dev-libs/libpcre/libpcre-8.02.bep
	dev-libs/libpcre/libpcre-8.12.bep
	dev-libs/libxml2/libxml2-2.7.3.bep
	dev-libs/libxml2/libxml2-2.7.6.bep
	dev-libs/libxml2/libxml2-2.7.7.bep
	dev-libs/libxml2/libxml2-2.7.8.bep
	dev-libs/openssl/openssl-0.9.8l.bep
	dev-libs/openssl/openssl-0.9.8m.bep
	dev-libs/openssl/openssl-1.0.0.bep
	dev-libs/openssl/openssl-1.0.0a.bep
	dev-libs/openssl/openssl-1.0.0c.bep
	dev-qt/qtcore/qtcore-4.8.x-git.bep
	dev-qt/qtcore/qtcore-4.8.x.recipe
	dev-util/ccache/ccache-3.0.1.bep
	dev-util/cmake/cmake-2.6.4.bep
	dev-util/cmake/cmake-2.8.0.bep
	dev-util/cmake/cmake-2.8.1.bep
	dev-util/cmake/cmake-2.8.2.bep
	dev-util/cmake/cmake-2.8.3.bep
	dev-util/cmake/cmake-2.8.4.bep
	dev-util/ctags/ctags-5.8.bep
	dev-util/fastdep/fastdep-0.16.bep
	dev-util/gperf/gperf-3.0.4.bep
	dev-util/pkgconfig/pkgconfig-0.23.bep
	dev-util/pkgconfig/pkgconfig-0.25.bep
	dev-vcs/cvs/cvs-1.12.13.1.bep
	dev-vcs/cvs/cvs-1.12.13.bep
	dev-vcs/subversion/subversion-1.6.11.bep
	dev-vcs/subversion/subversion-1.6.12.bep
	dev-vcs/subversion/subversion-1.6.13.bep
	dev-vcs/subversion/subversion-1.6.15.bep
	dev-vcs/subversion/subversion-1.6.6.bep
	dev-vcs/subversion/subversion-1.6.9.bep
	dev-vcs/subversion/subversion-1.7.xx-svn.bep
	haiku-apps/bepdf/bepdf-1.1.1b4.bep
	haiku-apps/libwalter/libwalter-97.bep
	haiku-apps/paladin/paladin-1.3-hg.bep
	haiku-apps/pe/pe-2.4.3-600.bep
	haiku-apps/vision/patches/vision-908-gcc4.patch
	haiku-apps/vision/vision-0.9.7.bep
	haiku-libs/libwalter/libwalter-97.bep
	haiku-libs/libwalter/libwalter-97.recipe
	media-gfx/graphviz/graphviz-2.24.bep
	media-gfx/graphviz/graphviz-2.26.3.bep
	media-libs/flac/flac-1.2.1.bep
	media-libs/freetype/freetype-2.3.11.bep
	media-libs/freetype/freetype-2.4.2.bep
	media-libs/freetype/freetype-2.4.4.bep
	media-libs/ftgl/ftgl-2.1-svn.bep
	media-libs/guilib/guilib-1.2.1.bep
	media-libs/jpeg/jpeg-7.bep
	media-libs/jpeg/jpeg-8b.bep
	media-libs/jpeg/jpeg-8c.bep
	media-libs/libao/libao-1.0.0.bep
	media-libs/libmad/libmad-0.15.1b.bep
	media-libs/libmng/libmng-1.0.10.bep
	media-libs/libogg/libogg-1.1.4.bep
	media-libs/libogg/libogg-1.2.0.bep
	media-libs/libogg/libogg-1.2.2.bep
	media-libs/libpng/libpng-1.2.29.bep
	media-libs/libpng/libpng-1.2.30.bep
	media-libs/libpng/libpng-1.2.40.bep
	media-libs/libpng/libpng-1.2.41.bep
	media-libs/libpng/libpng-1.2.43.bep
	media-libs/libpng/libpng-1.2.44.bep
	media-libs/libpng/libpng-1.4.1.bep
	media-libs/libpng/libpng-1.4.2.bep
	media-libs/libpng/libpng-1.4.3.bep
	media-libs/libpng/libpng-1.4.4.bep
	media-libs/libpng/libpng-1.5.0.bep
	media-libs/libsdl/patches/libsdl-1.2-hg.patch
	media-libs/libtheora/libtheora-1.1.1.bep
	media-libs/libvorbis/libvorbis-1.2.3.bep
	media-libs/libvorbis/libvorbis-1.3.1.bep
	media-libs/libvorbis/libvorbis-1.3.2.bep
	media-libs/libvpx/libvpx-0.9.2-git.bep
	media-libs/smpeg/smpeg-0.4.5.bep
	media-libs/speex/speex-1.2-git.bep
	media-libs/speex/speex-1.2rc1.bep
	media-sound/lame/lame-3.98.4.bep
	media-sound/lame/lame-398-2.bep
	media-sound/vorbis-tools/vorbis-tools-1.2.0.bep
	media-sound/vorbis-tools/vorbis-tools-1.4.0.bep
	media-video/ffmpeg/ffmpeg-0.5.bep
	media-video/ffmpeg/ffmpeg-0.6.bep
	net-misc/curl/curl-7.18.2.bep
	net-misc/curl/curl-7.19.1.bep
	net-misc/curl/curl-7.19.2.bep
	net-misc/curl/curl-7.19.5.bep
	net-misc/curl/curl-7.19.7.bep
	net-misc/curl/curl-7.20.0.bep
	net-misc/curl/curl-7.20.1.bep
	net-misc/curl/curl-7.21.1.bep
	net-misc/curl/curl-7.21.2.bep
	net-misc/curl/curl-7.21.3.bep
	net-misc/openssh/openssh-5.4p1.bep
	net-misc/openssh/openssh-5.5p1.bep
	net-misc/openssh/openssh-5.6p1.bep
	net-misc/openssh/openssh-5.7p1.bep
	net-misc/openssh/openssh-5.8p1.bep
	net-wireless/b43-fwcutter/b43-fwcutter-012.bep
	sci-libs/gsl/gsl-1.14.bep
	sys-apps/ed/ed-1.4.bep
	sys-apps/gawk/gawk-3.1.8.bep
	sys-apps/grep/grep-2.5.4.bep
	sys-apps/grep/grep-2.7.bep
	sys-apps/groff/groff-1.20.1.bep
	sys-apps/man/man-1.6f.bep
	sys-apps/sed/sed-4.2.1.bep
	sys-apps/texinfo/texinfo-4.13a.bep
	sys-devel/autoconf/autoconf-2.68.bep
	sys-devel/automake/automake-1.11.1.bep
	sys-devel/bison/bison-2.4.1.bep
	sys-devel/bison/bison-2.4.bep
	sys-devel/flex/flex-2.5.35.bep
	sys-devel/gettext/gettext-0.18.1.1-dev.bep
	sys-devel/gettext/gettext-0.18.1.1.bep
	sys-devel/jam/jam-2.5.bep
	sys-devel/m4/m4-1.4.14.bep
	sys-libs/ncurses/ncurses-5.6.bep
	sys-libs/ncurses/ncurses-5.7.bep
	sys-libs/readline/readline-5.2.bep
	sys-libs/readline/readline-6.0.bep
	sys-libs/readline/readline-6.1.bep
	sys-libs/zlib/zlib-1.2.3.bep
	sys-libs/zlib/zlib-1.2.5.bep
	x11-libs/qt/qt-4.8.x-git.bep
This commit is contained in:
Oliver Tappe
2013-10-15 22:48:02 +02:00
parent 79f735cb8b c69048fe86
commit f3532dc2cb
1452 changed files with 31199 additions and 33804 deletions
Download Patch File Download Diff File Expand all files Collapse all files

146
haiku-apps/burnitnow/patches/burnitnow-beta5_svn.patch Normal file
View File

@@ -0,0 +1,146 @@
diff -Naur burnitnow-beta5-svn/const.h burnitnow-beta5-svn-patch/const.h
--- burnitnow-beta5-svn/const.h 2012-11-20 19:48:42.045350912 +0100
+++ burnitnow-beta5-svn-patch/const.h 2012-11-20 17:57:36.000000000 +0100
@@ -64,7 +64,7 @@
const uint32 AUDIO_NOFIX = 'AuNF';
const uint32 MISC_DAO = 'MiDA';
-const uint32 MISC_BURNPROOF = 'MiBP';
+const uint32 MISC_BURNFREE = 'MiBP';
const uint32 BURN_WITH_CDRECORD = 'BWCR';
diff -Naur burnitnow-beta5-svn/jpWindow.cpp burnitnow-beta5-svn-patch/jpWindow.cpp
--- burnitnow-beta5-svn/jpWindow.cpp 2012-11-20 19:48:42.007602176 +0100
+++ burnitnow-beta5-svn-patch/jpWindow.cpp 2012-11-20 18:03:09.000000000 +0100
@@ -65,7 +65,7 @@
char* BURN_DIR;
BPath CDRTOOLS_DIR;
-char BURNPROOF[30]; // driveropts = burnproof
+char BURNFREE[30]; // driveropts=burnfree
char PAD[10]; // -pad (audio)
char DAO[10]; // -dao
char NOFIX[10]; // -nofix (audio)
@@ -714,10 +714,10 @@
else
strcpy(DAO, " ");
- if (fBurnItPrefs->FindString("BURNPROOF", &tr) == B_OK)
- strcpy(BURNPROOF, tr);
+ if (fBurnItPrefs->FindString("BURNFREE", &tr) == B_OK)
+ strcpy(BURNFREE, tr);
else
- strcpy(BURNPROOF, " ");
+ strcpy(BURNFREE, " ");
if (fBurnItPrefs->FindString("NOFIX", &tr) == B_OK)
strcpy(NOFIX, tr);
@@ -1398,11 +1398,11 @@
strcpy(DAO, " ");
break;
- case MISC_BURNPROOF:
- if (fPrefsView->fBurnProofCheckBox->Value() == 1)
- strcpy(BURNPROOF, "driveropts = burnproof");
+ case MISC_BURNFREE:
+ if (fPrefsView->fBurnFreeCheckBox->Value() == 1)
+ strcpy(BURNFREE, "driveropts=burnfree");
else
- strcpy(BURNPROOF, " ");
+ strcpy(BURNFREE, " ");
break;
case MENU_FILE_ABOUT:
@@ -1643,7 +1643,7 @@
fBurnItPrefs->SetString("DATA_STRING", DATA_STRING);
fBurnItPrefs->SetString("PAD", PAD);
fBurnItPrefs->SetString("DAO", DAO);
- fBurnItPrefs->SetString("BURNPROOF", BURNPROOF);
+ fBurnItPrefs->SetString("BURNFREE", BURNFREE);
fBurnItPrefs->SetString("SWAB", SWAB);
fBurnItPrefs->SetString("NOFIX", NOFIX);
fBurnItPrefs->SetString("PREEMP", PREEMP);
@@ -1812,7 +1812,7 @@
commandstr << BURN_DIR << '"' << " | " << CDRTOOLS_DIR.Path();
commandstr << "/cdrecord dev=" << fBurnDevice->scsiid;
commandstr << " speed=" << BURN_SPD ;
- commandstr << " " << BURNPROOF;
+ commandstr << " " << BURNFREE;
commandstr << "tsize" << tsize << " ";
commandstr << DAO << " -data ";
commandstr << DUMMYMODE ;
@@ -1822,7 +1822,7 @@
commandstr.SetTo(CDRTOOLS_DIR.Path());
commandstr << "/";
commandstr << "cdrecord dev=" << fBurnDevice->scsiid << " speed=" << BURN_SPD ;
- commandstr << " " << BURNPROOF << " " << DAO;
+ commandstr << " " << BURNFREE << " " << DAO;
commandstr << " -data " << DUMMYMODE ;
commandstr << " " << EJECT ;
commandstr << " -v" ; // aw 110910
@@ -1847,7 +1847,7 @@
commandstr << "//";
commandstr << "cdrecord dev=" << fBurnDevice->scsiid;
commandstr << " speed=" << BURN_SPD;
- commandstr << " " << BURNPROOF ;
+ commandstr << " " << BURNFREE ;
commandstr << " " << DAO;
commandstr << " " << PAD;
commandstr << " " << PREEMP ;
@@ -1880,7 +1880,7 @@
commandstr << '"' << VOL_NAME << '"' << BURN_DIR << '"' << " |";
commandstr << CDRTOOLS_DIR.Path() << "/cdrecord dev=" ;
commandstr << fBurnDevice->scsiid << "speed=" << BURN_SPD ;
- commandstr << " " << BURNPROOF;
+ commandstr << " " << BURNFREE;
commandstr << " tsize=" << tsize ;
commandstr << " " << DAO << " " << DUMMYMODE ;
commandstr << " " << EJECT << " " << PAD ;
@@ -1893,7 +1893,7 @@
commandstr << "//";
commandstr << "cdrecord dev=" << fBurnDevice->scsiid;
commandstr << " speed=" << BURN_SPD ;
- commandstr << " " << BURNPROOF << " " << DAO << " " << PAD ;
+ commandstr << " " << BURNFREE << " " << DAO << " " << PAD ;
commandstr << " " << PREEMP << " " << SWAB ;
commandstr << " " << NOFIX ;
commandstr << " " << DUMMYMODE ;
diff -Naur burnitnow-beta5-svn/PrefsView.cpp burnitnow-beta5-svn-patch/PrefsView.cpp
--- burnitnow-beta5-svn/PrefsView.cpp 2012-11-20 19:48:42.031981568 +0100
+++ burnitnow-beta5-svn-patch/PrefsView.cpp 2012-11-20 18:02:46.000000000 +0100
@@ -16,7 +16,7 @@
extern char DAO[10];
-extern char BURNPROOF[30];
+extern char BURNFREE[30];
PrefsView::PrefsView(BRect size)
@@ -59,9 +59,9 @@
r.top += 15;
r.bottom += 15;
- fBurnProofCheckBox = new BCheckBox(r, "burnproof", "BurnProof (read help)", new BMessage(MISC_BURNPROOF));
- if (!strncmp(BURNPROOF, "driveropts = burnproof", 22))
- fBurnProofCheckBox->SetValue(B_CONTROL_ON);
+ fBurnFreeCheckBox = new BCheckBox(r, "burnfree", "BurnFree (read help)", new BMessage(MISC_BURNFREE));
+ if (!strncmp(BURNFREE, "driveropts=burnfree", 22))
+ fBurnFreeCheckBox->SetValue(B_CONTROL_ON);
- miscOptBox->AddChild(fBurnProofCheckBox);
+ miscOptBox->AddChild(fBurnFreeCheckBox);
}
diff -Naur burnitnow-beta5-svn/PrefsView.h burnitnow-beta5-svn-patch/PrefsView.h
--- burnitnow-beta5-svn/PrefsView.h 2012-11-20 19:48:42.015990784 +0100
+++ burnitnow-beta5-svn-patch/PrefsView.h 2012-11-20 17:57:08.000000000 +0100
@@ -15,7 +15,7 @@
PrefsView(BRect size);
BMenu* fRecordersMenu;
- BCheckBox* fDAOCheckBox, *fBurnProofCheckBox;
+ BCheckBox* fDAOCheckBox, *fBurnFreeCheckBox;
};