[PC-BSD Commits] r3608 - in pbibuild/pbi-source: PBIsource PBItext

[svn at pcbsd.org]

Author: kris
Date: 2009-03-06 13:06:01 -0800 (Fri, 06 Mar 2009)
New Revision: 3608

Modified:
   pbibuild/pbi-source/PBIsource/PBI.pro
   pbibuild/pbi-source/PBIsource/main.cpp
   pbibuild/pbi-source/PBIsource/pbi.cpp
   pbibuild/pbi-source/PBItext/PBItext.pro
   pbibuild/pbi-source/PBItext/main.cpp
Log:

Updated PBI to add LC_ALL variable to .sbin scripts, fixes problems with UTF-8 and Russian Characters



Modified: pbibuild/pbi-source/PBIsource/PBI.pro
===================================================================
--- pbibuild/pbi-source/PBIsource/PBI.pro	2009-03-06 20:58:30 UTC (rev 3607)
+++ pbibuild/pbi-source/PBIsource/PBI.pro	2009-03-06 21:06:01 UTC (rev 3608)
@@ -3,9 +3,9 @@
 
 CONFIG	+= qt warn_on release
 
-LIBS	+= -L/usr/local/kde4/lib -lkdecore -lkio -lkdeui -Ikdelibs 
+LIBS	+= -L/usr/local/lib 
 
-INCLUDEPATH += /usr/local/kde4/include
+INCLUDEPATH += /usr/local/include
 
 HEADERS += pbi.h
 
@@ -25,4 +25,4 @@
 
 QT += qt3support
 
-QMAKE_LIBDIR = /usr/local/kde4/lib /usr/local/lib/qt4 /usr/local/lib
+QMAKE_LIBDIR = /usr/local/lib/qt4 /usr/local/lib

Modified: pbibuild/pbi-source/PBIsource/main.cpp
===================================================================
--- pbibuild/pbi-source/PBIsource/main.cpp	2009-03-06 20:58:30 UTC (rev 3607)
+++ pbibuild/pbi-source/PBIsource/main.cpp	2009-03-06 21:06:01 UTC (rev 3608)
@@ -1,36 +1,37 @@
 #include <qapplication.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+//#include <kapplication.h>
+//#include <kcmdlineargs.h>
 #include <qtranslator.h>
 #include <qtextcodec.h>
-#include <kaboutdata.h>
+//#include <kaboutdata.h>
 #include "pbi.h"
 
-static const char description[] = I18N_NOOP("PBI Install GUI");
+//static const char description[] = I18N_NOOP("PBI Install GUI");
 
 int main( int argc, char ** argv )
 {
 
-    KAboutData aboutData("PBI", 0, ki18n("PBI"),
-                            "4.4", ki18n(description),
-                            KAboutData::License_BSD,
-                            ki18n("(c) 2008, Kris Moore(c)"));
+    //KAboutData aboutData("PBI", 0, ki18n("PBI"),
+    //                        "4.4", ki18n(description),
+    //                        KAboutData::License_BSD,
+    //                        ki18n("(c) 2008, Kris Moore(c)"));
 
-    aboutData.addAuthor(ki18n("Kris Moore"), ki18n("Current maintainer"), "kris at pcbsd.org");
+    //aboutData.addAuthor(ki18n("Kris Moore"), ki18n("Current maintainer"), "kris at pcbsd.org");
 
-    KCmdLineArgs::init(argc, argv, &aboutData);
+    //KCmdLineArgs::init(argc, argv, &aboutData);
 
-    KCmdLineOptions options;
+    //KCmdLineOptions options;
 
-    options.add("", ki18n("Start the PBI Install"));
-    options.add("extract", ki18n("Extract the PBI files and create the .pbc configuration"));
+    //options.add("", ki18n("Start the PBI Install"));
+    //options.add("extract", ki18n("Extract the PBI files and create the .pbc configuration"));
 
 
     // Tell which options are supported
-    KCmdLineArgs::addCmdLineOptions( options );
+    //KCmdLineArgs::addCmdLineOptions( options );
 
 
-    KApplication a;
+    //KApplication a;
+    QApplication a( argc, argv );
 
           
    
@@ -55,8 +56,11 @@
     
  
      
-    w.ProgramInit(a.applicationDirPath());
+    w.ProgramInit(QApplication::applicationDirPath());
     w.show();
     a.connect( &a, SIGNAL( lastWindowClosed() ), &a, SLOT( quit() ) );
     return a.exec();
+
+    return a.exec();
+
 }

Modified: pbibuild/pbi-source/PBIsource/pbi.cpp
===================================================================
--- pbibuild/pbi-source/PBIsource/pbi.cpp	2009-03-06 20:58:30 UTC (rev 3607)
+++ pbibuild/pbi-source/PBIsource/pbi.cpp	2009-03-06 21:06:01 UTC (rev 3608)
@@ -11,10 +11,10 @@
 *****************************************************************************/
 /****************************************************************************
 *     Name: PBI-Wizard
-*  Version: 4.6 
+*  Version: 5.1 
 *   Author: Kris Moore
 *  License: BSD (See LICENSE file for more detail)
-*     Date: 7-22-08
+*     Date: 3-06-09
 *****************************************************************************/
 
 #include <iostream>
@@ -561,6 +561,7 @@
              stream2 << "# Auto-Generated by PC-BSD\n";
              stream2 << "PROGDIR=\"/Programs/" + ProgDirName + "\" ; export PROGDIR\n";     
              stream2 << "PATH=\"${PROGDIR}/bin:$PATH\"; export PATH\n";     
+             stream2 << "LC_ALL=\"${LANG}\"; export LC_ALL\n";     
              stream2 << "LANG=\"`grep ^Language= ~/.kde4/share/config/kdeglobals | cut -d \"=\" -f2`\"; export LANG\n";     
              stream2 << "XDG_DATA_DIRS=\"${PROGDIR}/share:${PROGDIR}/kde4/share:${XDG_DATA_DIRS}\"; export XDG_DATA_DIRS\n";     
 

Modified: pbibuild/pbi-source/PBItext/PBItext.pro
===================================================================
--- pbibuild/pbi-source/PBItext/PBItext.pro	2009-03-06 20:58:30 UTC (rev 3607)
+++ pbibuild/pbi-source/PBItext/PBItext.pro	2009-03-06 21:06:01 UTC (rev 3608)
@@ -13,4 +13,4 @@
   OBJECTS_DIR = .obj
 }
 
-QMAKE_LIBDIR = /usr/local/kde4/lib /usr/local/lib/qt4
+QMAKE_LIBDIR = /PCBSD/local/lib /PCBSD/local/lib/qt4 /usr/local/lib /usr/local/lib/qt4

Modified: pbibuild/pbi-source/PBItext/main.cpp
===================================================================
--- pbibuild/pbi-source/PBItext/main.cpp	2009-03-06 20:58:30 UTC (rev 3607)
+++ pbibuild/pbi-source/PBItext/main.cpp	2009-03-06 21:06:01 UTC (rev 3608)
@@ -526,6 +526,7 @@
              stream2 << "# Auto-Generated by PC-BSD\n";
              stream2 << "PROGDIR=\"/Programs/" + ProgDirName + "\" ; export PROGDIR\n";
              stream2 << "PATH=\"${PROGDIR}/bin:$PATH\"; export PATH\n";
+	     stream2 << "LC_ALL=\"${LANG}\"; export LC_ALL\n";
              stream2 << "LANG=\"`grep ^Language= ~/.kde4/share/config/kdeglobals | cut -d \"=\" -f2`\"; export LANG\n";
              stream2 << "XDG_DATA_DIRS=\"${PROGDIR}/share:${PROGDIR}/kde4/share:${XDG_DATA_DIRS}\"; export XDG_DATA_DIRS\n";