Browse Source

kde/kbib: Removed the faulty encoding patch.

The patch previously applied for allowing the user to select the
encoding caused the application to crash when entering the
configuration dialog box. Thus I don't apply this patch anymore
(my bibliographies are stored in UTF-8 anyway).
slackware-14.2
Damien Goutte-Gattat 12 years ago
parent
commit
13d9d007da
2 changed files with 1 additions and 101 deletions
  1. +0
    -95
      kde/kbib/encoding.diff
  2. +1
    -6
      kde/kbib/kbib.SlackBuild

+ 0
- 95
kde/kbib/encoding.diff View File

@ -1,95 +0,0 @@
diff -Naur kbib-0.6.4.orig/kbib/kbib.cpp kbib-0.6.4/kbib/kbib.cpp
--- kbib-0.6.4.orig/kbib/kbib.cpp 2008-01-12 11:25:06.000000000 +0100
+++ kbib-0.6.4/kbib/kbib.cpp 2008-11-08 00:53:52.000000000 +0100
@@ -112,8 +112,6 @@
firstRun = TRUE;
config=kapp->config();
- QTextCodec *codec = QTextCodec::codecForName("utf8");
- QTextCodec::setCodecForCStrings(codec);
@@ -156,8 +154,8 @@
readOptions();
-// QTextCodec *codec = QTextCodec::codecForName((kbibConfigState.encoding).latin1());
-// QTextCodec::setCodecForCStrings(codec);
+ QTextCodec *codec = QTextCodec::codecForName((kbibConfigState.encoding).latin1());
+ QTextCodec::setCodecForCStrings(codec);
@@ -521,7 +519,7 @@
config->writeEntry("Web Browser", kbibConfigState.browser);
config->writeEntry("Compare references", kbibConfigState.compareRefSetting);
config->writeEntry("Citation Key Connecting String", kbibConfigState.keyConnecting);
-// config->writeEntry("Encoding", kbibConfigState.encoding);
+ config->writeEntry("Encoding", kbibConfigState.encoding);
config->writeEntry("Show Group View", !groupViewVisible);
config->writeEntry("Show Preview", !previewVisible);
@@ -587,7 +585,7 @@
kbibConfigState.browser = config->readEntry("Web Browser","konqueror");
kbibConfigState.compareRefSetting = config->readNumEntry("Compare references",1);
kbibConfigState.keyConnecting = config->readEntry("Citation Key Connecting String","");
-// kbibConfigState.encoding = config->readEntry("Encoding", QString::fromLatin1("utf8"));
+ kbibConfigState.encoding = config->readEntry("Encoding", QString::fromLatin1("utf8"));
groupViewVisible = config->readBoolEntry("Show Group View", false);
previewVisible = config->readBoolEntry("Show Preview", false);
diff -Naur kbib-0.6.4.orig/kbib/kbib.h kbib-0.6.4/kbib/kbib.h
--- kbib-0.6.4.orig/kbib/kbib.h 2008-01-12 11:22:00.000000000 +0100
+++ kbib-0.6.4/kbib/kbib.h 2008-11-08 00:53:52.000000000 +0100
@@ -71,7 +71,7 @@
int authorDisplaySetting;
bool autocompletion;
QMap<QString, QString> globalStringMacros;
-// QString encoding;
+ QString encoding;
}
configState;
diff -Naur kbib-0.6.4.orig/kbib/kbibconfigdlg.cpp kbib-0.6.4/kbib/kbibconfigdlg.cpp
--- kbib-0.6.4.orig/kbib/kbibconfigdlg.cpp 2008-01-12 11:25:06.000000000 +0100
+++ kbib-0.6.4/kbib/kbibconfigdlg.cpp 2008-11-08 00:53:52.000000000 +0100
@@ -113,7 +113,7 @@
state.askReqField = askReqField->isChecked();
state.autocompletion = ! ( autocompletion->isChecked() );
state.keyConnecting = ( keyConnectingEdit->text() ).stripWhiteSpace();
- // state.encoding = encoding->currentText();
+ state.encoding = encoding->currentText();
for ( QListBoxItem* item = selectedFields->firstItem(); item; item = item->next() )
{
state.displayFields += item->text();
@@ -207,7 +207,7 @@
autocompletion->setChecked ( !mState.autocompletion );
keyConnectingEdit->setText ( mState.keyConnecting );
- // encoding->setCurrentText(mState.encoding);
+ encoding->setCurrentText(mState.encoding);
//(browser->lineEdit()) ->setText(mState.browser);
//(textViewer->lineEdit())->setText(mState.textViewer);
@@ -280,7 +280,7 @@
keyConnectingEdit->setText ( "" );
fieldDelimiter->setCurrentItem ( 0 );
- // encoding->setCurrentText(QString::fromLatin1("utf8"));
+ encoding->setCurrentText(QString::fromLatin1("utf8"));
}
else if ( activePageIndex() ==1 )
diff -Naur kbib-0.6.4.orig/kbib/kbibconfigdlg.h kbib-0.6.4/kbib/kbibconfigdlg.h
--- kbib-0.6.4.orig/kbib/kbibconfigdlg.h 2008-01-12 11:22:00.000000000 +0100
+++ kbib-0.6.4/kbib/kbibconfigdlg.h 2008-11-08 00:54:03.000000000 +0100
@@ -109,7 +109,7 @@
QRadioButton *allAuthorSelect;
QVButtonGroup *authorsDisplay;
-// QComboBox *encoding;
+ QComboBox *encoding;
QComboBox * textViewer;
QComboBox * browser;

+ 1
- 6
kde/kbib/kbib.SlackBuild View File

@ -30,7 +30,7 @@ WGET=${WGET:-http://users.tpg.com.au/thachly/kbib/$ARCHIVE}
# Built kbib infos
NAMETGZ=${NAMETGZ:-kbib}
BUILD=${BUILD:-2GGD}
BUILD=${BUILD:-3GGD}
ARCH=${ARCH:-i486}
TARGET=${TARGET:-i486}
@ -75,11 +75,6 @@ echo "Building $ARCHIVE..."
tar xf $CWD/$ARCHIVE
cd $NAME
# Patch the code to (re)allow the user to choose the encoding
if [ -f $CWD/encoding.diff ]; then
patch -p1 < $CWD/encoding.diff
fi
CFLAGS=$CPUOPT \
CXXFLAGS=$CPUOPT \
./configure \


Loading…
Cancel
Save