[PC-BSD Commits] r814 - in pcbsd/trunk: PBIsource PBItext system-overlay/PCBSD/packages
svn at pcbsd.org
svn at pcbsd.org
Thu Nov 1 19:07:17 PST 2007
Author: kris
Date: 2007-11-01 20:07:16 -0700 (Thu, 01 Nov 2007)
New Revision: 814
Modified:
pcbsd/trunk/PBIsource/pbi.ui.h
pcbsd/trunk/PBItext/main.cpp
pcbsd/trunk/system-overlay/PCBSD/packages/nvidia-driver-100.14.19.tbz
pcbsd/trunk/system-overlay/PCBSD/packages/nvidia-driver-71.86.01.tbz
pcbsd/trunk/system-overlay/PCBSD/packages/nvidia-driver-96.43.01.tbz
Log:
Updated the NVIDIA drivers for the latest patch, and fixed a bad bug in PBI
which caused the GTK / Pango libs to not be properly setup with changeover to
/usr/local instead of /usr/X11R6 and libs -> autolibs in PBI format.
Modified: pcbsd/trunk/PBIsource/pbi.ui.h
===================================================================
--- pcbsd/trunk/PBIsource/pbi.ui.h 2007-10-31 20:48:28 UTC (rev 813)
+++ pcbsd/trunk/PBIsource/pbi.ui.h 2007-11-02 03:07:16 UTC (rev 814)
@@ -397,7 +397,7 @@
{
- QFile GTKCheck("/Programs/" + ProgDirName + "/libs/pangorc");
+ QFile GTKCheck("/Programs/" + ProgDirName + "/autolibs/pangorc");
if (GTKCheck.exists() )
{
GTKFound = 1;
@@ -530,8 +530,8 @@
if ( GTKFound == 1 )
{
- stream2 << "\nGDK_PIXBUF_MODULE_FILE=\"/Programs/" + ProgDirName + "/libs/etc/gtk-dir/gdk-pixbuf.loaders\" ; export GDK_PIXBUF_MODULE_FILE\n";
- stream2 << "PANGO_RC_FILE=\"/Programs/" + ProgDirName + "/libs/pangorc\"; export PANGO_RC_FILE\n\n";
+ stream2 << "\nGDK_PIXBUF_MODULE_FILE=\"/Programs/" + ProgDirName + "/autolibs/etc/gtk-dir/gdk-pixbuf.loaders\" ; export GDK_PIXBUF_MODULE_FILE\n";
+ stream2 << "PANGO_RC_FILE=\"/Programs/" + ProgDirName + "/autolibs/pangorc\"; export PANGO_RC_FILE\n\n";
}
@@ -1521,18 +1521,18 @@
QString line;
// Create the pangorc file
- QFile GTKCheck("/Programs/" + ProgDirName + "/libs/pangorc");
+ QFile GTKCheck("/Programs/" + ProgDirName + "/autolibs/pangorc");
if ( GTKCheck.open( IO_WriteOnly) ) {
QTextStream stream( >KCheck );
stream << "[Pango]\n";
- stream << "ModuleFiles=/Programs/" + ProgDirName + "/libs/etc/pango-dir/pango.modules\n";
+ stream << "ModuleFiles=/Programs/" + ProgDirName + "/autolibs/etc/pango-dir/pango.modules\n";
stream << "[PangoX]\n";
- stream << "AliasFiles=/Programs/" +ProgDirName + "/libs/etc/pango-dir/pangox.aliases";
+ stream << "AliasFiles=/Programs/" +ProgDirName + "/autolibs/etc/pango-dir/pangox.aliases";
}
// Edit the GTK etc files
- QFile file( "/Programs/" + ProgDirName + "/libs/etc/gtk-dir/gdk-pixbuf.loaders" );
+ QFile file( "/Programs/" + ProgDirName + "/autolibs/etc/gtk-dir/gdk-pixbuf.loaders" );
if ( file.open( IO_ReadOnly ) ) {
QTextStream stream( &file );
@@ -1542,8 +1542,14 @@
{
tmp = line.replace("\"/usr/X11R6/lib/", "");
//tmp.remove(0, tmp.find("/") + 1 );
- tmp = "\"/Programs/" + ProgDirName + "/libs/" + tmp;
+ tmp = "\"/Programs/" + ProgDirName + "/autolibs/" + tmp;
EditFile = EditFile + tmp + "\n";
+ } else if ( line.find("\"/usr/local/lib/gtk" ) == 0)
+ {
+ tmp = line.replace("\"/usr/local/lib/", "");
+ //tmp.remove(0, tmp.find("/") + 1 );
+ tmp = "\"/Programs/" + ProgDirName + "/autolibs/" + tmp;
+ EditFile = EditFile + tmp + "\n";
} else {
EditFile = EditFile + line + "\n";
}
@@ -1553,7 +1559,7 @@
file.close();
- QFile GTKWrite("/Programs/" + ProgDirName + "/libs/etc/gtk-dir/gdk-pixbuf.loaders");
+ QFile GTKWrite("/Programs/" + ProgDirName + "/autolibs/etc/gtk-dir/gdk-pixbuf.loaders");
if ( GTKWrite.open( IO_WriteOnly) ) {
QTextStream streamGTK( >KWrite );
streamGTK << EditFile;
@@ -1562,7 +1568,7 @@
EditFile = "";
// Edit the GTK etc files
- QFile Pangofile( "/Programs/" + ProgDirName + "/libs/etc/pango-dir/pango.modules" );
+ QFile Pangofile( "/Programs/" + ProgDirName + "/autolibs/etc/pango-dir/pango.modules" );
if ( Pangofile.open( IO_ReadOnly ) ) {
QTextStream stream2( &Pangofile );
@@ -1572,8 +1578,14 @@
{
tmp = line.replace("/usr/X11R6/lib/", "");
//tmp.remove(0, tmp.find("/") + 1 );
- tmp = "/Programs/" + ProgDirName + "/libs/" + tmp;
+ tmp = "/Programs/" + ProgDirName + "/autolibs/" + tmp;
EditFile = EditFile + tmp + "\n";
+ } else if ( line.find("/usr/local/lib/pango" ) == 0)
+ {
+ tmp = line.replace("/usr/local/lib/", "");
+ //tmp.remove(0, tmp.find("/") + 1 );
+ tmp = "/Programs/" + ProgDirName + "/autolibs/" + tmp;
+ EditFile = EditFile + tmp + "\n";
} else {
EditFile = EditFile + line + "\n";
}
@@ -1583,7 +1595,7 @@
Pangofile.close();
- QFile PangoWrite("/Programs/" + ProgDirName + "/libs/etc/pango-dir/pango.modules");
+ QFile PangoWrite("/Programs/" + ProgDirName + "/autolibs/etc/pango-dir/pango.modules");
if ( PangoWrite.open( IO_WriteOnly) ) {
QTextStream streamPango( &PangoWrite );
streamPango << EditFile;
Modified: pcbsd/trunk/PBItext/main.cpp
===================================================================
--- pcbsd/trunk/PBItext/main.cpp 2007-10-31 20:48:28 UTC (rev 813)
+++ pcbsd/trunk/PBItext/main.cpp 2007-11-02 03:07:16 UTC (rev 814)
@@ -356,7 +356,7 @@
{
if ( LibDir == "Auto")
{
- QString command = "cp -Rf libs /Programs/" + ProgDirName + "/";
+ QString command = "cp -Rf autolibs /Programs/" + ProgDirName + "/";
QString inputLine = getLineFromCommandOutput(command);
CreateConfigSlot();
@@ -371,7 +371,7 @@
{
- QFile GTKCheck("/Programs/" + ProgDirName + "/libs/pangorc");
+ QFile GTKCheck("/Programs/" + ProgDirName + "/autolibs/pangorc");
if (GTKCheck.exists() )
{
GTKFound = 1;
@@ -500,8 +500,8 @@
if ( GTKFound == 1 )
{
- stream2 << "\nGDK_PIXBUF_MODULE_FILE=\"/Programs/" + ProgDirName + "/libs/etc/gtk-dir/gdk-pixbuf.loaders\" ; export GDK_PIXBUF_MODULE_FILE\n";
- stream2 << "PANGO_RC_FILE=\"/Programs/" + ProgDirName + "/libs/pangorc\"; export PANGO_RC_FILE\n\n";
+ stream2 << "\nGDK_PIXBUF_MODULE_FILE=\"/Programs/" + ProgDirName + "/autolibs/etc/gtk-dir/gdk-pixbuf.loaders\" ; export GDK_PIXBUF_MODULE_FILE\n";
+ stream2 << "PANGO_RC_FILE=\"/Programs/" + ProgDirName + "/autolibs/pangorc\"; export PANGO_RC_FILE\n\n";
}
@@ -1087,18 +1087,18 @@
QString line;
// Create the pangorc file
- QFile GTKCheck("/Programs/" + ProgDirName + "/libs/pangorc");
+ QFile GTKCheck("/Programs/" + ProgDirName + "/autolibs/pangorc");
if ( GTKCheck.open( IO_WriteOnly) ) {
QTextStream stream( >KCheck );
stream << "[Pango]\n";
- stream << "ModuleFiles=/Programs/" + ProgDirName + "/libs/etc/pango-dir/pango.modules\n";
+ stream << "ModuleFiles=/Programs/" + ProgDirName + "/autolibs/etc/pango-dir/pango.modules\n";
stream << "[PangoX]\n";
- stream << "AliasFiles=/Programs/" +ProgDirName + "/libs/etc/pango-dir/pangox.aliases";
+ stream << "AliasFiles=/Programs/" +ProgDirName + "/autolibs/etc/pango-dir/pangox.aliases";
}
// Edit the GTK etc files
- QFile file( "/Programs/" + ProgDirName + "/libs/etc/gtk-dir/gdk-pixbuf.loaders" );
+ QFile file( "/Programs/" + ProgDirName + "/autolibs/etc/gtk-dir/gdk-pixbuf.loaders" );
if ( file.open( IO_ReadOnly ) ) {
QTextStream stream( &file );
@@ -1108,8 +1108,14 @@
{
tmp = line.replace("\"/usr/X11R6/lib/", "");
//tmp.remove(0, tmp.find("/") + 1 );
- tmp = "\"/Programs/" + ProgDirName + "/libs/" + tmp;
+ tmp = "\"/Programs/" + ProgDirName + "/autolibs/" + tmp;
EditFile = EditFile + tmp + "\n";
+ } else if ( line.find("\"/usr/local/lib/gtk" ) == 0)
+ {
+ tmp = line.replace("\"/usr/local/lib/", "");
+ //tmp.remove(0, tmp.find("/") + 1 );
+ tmp = "\"/Programs/" + ProgDirName + "/autolibs/" + tmp;
+ EditFile = EditFile + tmp + "\n";
} else {
EditFile = EditFile + line + "\n";
}
@@ -1119,7 +1125,7 @@
file.close();
- QFile GTKWrite("/Programs/" + ProgDirName + "/libs/etc/gtk-dir/gdk-pixbuf.loaders");
+ QFile GTKWrite("/Programs/" + ProgDirName + "/autolibs/etc/gtk-dir/gdk-pixbuf.loaders");
if ( GTKWrite.open( IO_WriteOnly) ) {
QTextStream streamGTK( >KWrite );
streamGTK << EditFile;
@@ -1128,7 +1134,7 @@
EditFile = "";
// Edit the GTK etc files
- QFile Pangofile( "/Programs/" + ProgDirName + "/libs/etc/pango-dir/pango.modules" );
+ QFile Pangofile( "/Programs/" + ProgDirName + "/autolibs/etc/pango-dir/pango.modules" );
if ( Pangofile.open( IO_ReadOnly ) ) {
QTextStream stream2( &Pangofile );
@@ -1138,8 +1144,14 @@
{
tmp = line.replace("/usr/X11R6/lib/", "");
//tmp.remove(0, tmp.find("/") + 1 );
- tmp = "/Programs/" + ProgDirName + "/libs/" + tmp;
+ tmp = "/Programs/" + ProgDirName + "/autolibs/" + tmp;
EditFile = EditFile + tmp + "\n";
+ } else if ( line.find("/usr/local/lib/pango" ) == 0)
+ {
+ tmp = line.replace("/usr/local/lib/", "");
+ //tmp.remove(0, tmp.find("/") + 1 );
+ tmp = "/Programs/" + ProgDirName + "/autolibs/" + tmp;
+ EditFile = EditFile + tmp + "\n";
} else {
EditFile = EditFile + line + "\n";
}
@@ -1149,7 +1161,7 @@
Pangofile.close();
- QFile PangoWrite("/Programs/" + ProgDirName + "/libs/etc/pango-dir/pango.modules");
+ QFile PangoWrite("/Programs/" + ProgDirName + "/autolibs/etc/pango-dir/pango.modules");
if ( PangoWrite.open( IO_WriteOnly) ) {
QTextStream streamPango( &PangoWrite );
streamPango << EditFile;
Modified: pcbsd/trunk/system-overlay/PCBSD/packages/nvidia-driver-100.14.19.tbz
===================================================================
(Binary files differ)
Modified: pcbsd/trunk/system-overlay/PCBSD/packages/nvidia-driver-71.86.01.tbz
===================================================================
(Binary files differ)
Modified: pcbsd/trunk/system-overlay/PCBSD/packages/nvidia-driver-96.43.01.tbz
===================================================================
(Binary files differ)
More information about the Commits
mailing list