aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--office/re-typeset/paths.diff41
-rw-r--r--office/re-typeset/paths.diff.gzbin0 -> 793 bytes
-rw-r--r--office/re-typeset/re-typeset.SlackBuild8
-rw-r--r--office/re-typeset/rm_lang_menu.diff65
-rw-r--r--office/re-typeset/rm_lang_menu.diff.gzbin0 -> 1093 bytes
5 files changed, 4 insertions, 110 deletions
diff --git a/office/re-typeset/paths.diff b/office/re-typeset/paths.diff
deleted file mode 100644
index 097d326bef..0000000000
--- a/office/re-typeset/paths.diff
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -Naur re-typeset-1.2.0/re-typeset-src/mainwindow.cpp re-typeset-1.2.0.patched/re-typeset-src/mainwindow.cpp
---- re-typeset-1.2.0/re-typeset-src/mainwindow.cpp 2016-10-13 15:51:19.000000000 -0400
-+++ re-typeset-1.2.0.patched/re-typeset-src/mainwindow.cpp 2018-12-25 12:17:28.448448693 -0500
-@@ -22,6 +22,7 @@
- #include "mainwindow.hpp"
- #include "license.hpp"
- #include "ui_mainwindow.h"
-+#include <QLibraryInfo>
- #include <QImage>
- #include <QDebug>
- #include <QPainter>
-@@ -43,7 +44,7 @@
- ui->pageSizeWidth->setSuffix( " px" );
-
- createLanguageMenu();
-- setWindowIcon( QIcon( QApplication::applicationDirPath() + "res/re-typeset.png" ) );
-+ setWindowIcon( QIcon( "/usr/share/pixmaps/re-typeset.png" ) );
-
- QString locale = QLocale::system().name();
- locale.truncate(locale.lastIndexOf('_'));
-@@ -332,8 +333,8 @@
- currLang_ = rLanguage;
- QLocale locale = QLocale(currLang_);
- QLocale::setDefault(locale);
-- switchTranslator(translator_, QString("res/re-typeset_%1.qm").arg(rLanguage));
-- switchTranslator(translatorQt_, QString("languages/qt_%1.qm").arg(rLanguage));
-+ switchTranslator(translator_, QString("/usr/share/re-typeset/re-typeset_%1.qm").arg(rLanguage));
-+ switchTranslator(translatorQt_, QString("%1/qt_%2.qm").arg(QLibraryInfo::location(QLibraryInfo::TranslationsPath)).arg(rLanguage));
- }
- }
-
-@@ -343,8 +344,7 @@
- connect(langGroup, SIGNAL(triggered(QAction *)), this, SLOT(slotLanguageChanged(QAction *)));
- QString defaultLocale = QLocale::system().name(); // e.g. "de_DE" // format systems language
- defaultLocale.truncate(defaultLocale.lastIndexOf('_')); // e.g. "de"
-- langPath_ = QApplication::applicationDirPath();
-- langPath_.append("/res");
-+ langPath_ = QString("/usr/share/re-typeset");
- QDir dir(langPath_);
- QStringList fileNames = dir.entryList(QStringList("re-typeset_*.qm"));
- if( fileNames.size() == 0 ) {
diff --git a/office/re-typeset/paths.diff.gz b/office/re-typeset/paths.diff.gz
new file mode 100644
index 0000000000..0574a5922a
--- /dev/null
+++ b/office/re-typeset/paths.diff.gz
Binary files differ
diff --git a/office/re-typeset/re-typeset.SlackBuild b/office/re-typeset/re-typeset.SlackBuild
index e88e46023d..8e1c65ef0d 100644
--- a/office/re-typeset/re-typeset.SlackBuild
+++ b/office/re-typeset/re-typeset.SlackBuild
@@ -42,8 +42,8 @@ rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
-find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
- \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
# The Language menu doesn't actually work. For now, it's disabled,
# unless/until someone fixes it (upstream? me? *you*?). If you build
@@ -54,10 +54,10 @@ LANGMENU="${LANGMENU:-no}"
if [ "$LANGMENU" = "yes" ]; then
# Look in /usr/share/$PRGNAM for language icons and translations.
- patch -p1 < $CWD/paths.diff
+ zcat $CWD/paths.diff.gz | patch -p1
else
# Remove the Languages menu entirely.
- patch -p1 < $CWD/rm_lang_menu.diff
+ zcat $CWD/rm_lang_menu.diff.gz | patch -p1
fi
# The Makefile is a mess... and it's intended for the author's particular
diff --git a/office/re-typeset/rm_lang_menu.diff b/office/re-typeset/rm_lang_menu.diff
deleted file mode 100644
index 4be8181c6e..0000000000
--- a/office/re-typeset/rm_lang_menu.diff
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -Naur re-typeset-1.2.0/re-typeset-src/mainwindow.cpp re-typeset-1.2.0.patched/re-typeset-src/mainwindow.cpp
---- re-typeset-1.2.0/re-typeset-src/mainwindow.cpp 2016-10-13 15:51:19.000000000 -0400
-+++ re-typeset-1.2.0.patched/re-typeset-src/mainwindow.cpp 2018-12-26 16:51:03.683711862 -0500
-@@ -42,7 +42,6 @@
- ui->pageSizeHeight->setSuffix( " px" );
- ui->pageSizeWidth->setSuffix( " px" );
-
-- createLanguageMenu();
- setWindowIcon( QIcon( QApplication::applicationDirPath() + "res/re-typeset.png" ) );
-
- QString locale = QLocale::system().name();
-@@ -337,38 +336,6 @@
- }
- }
-
--void MainWindow::createLanguageMenu() {
-- QActionGroup* langGroup = new QActionGroup(ui->menuLanguage);
-- langGroup->setExclusive(true);
-- connect(langGroup, SIGNAL(triggered(QAction *)), this, SLOT(slotLanguageChanged(QAction *)));
-- QString defaultLocale = QLocale::system().name(); // e.g. "de_DE" // format systems language
-- defaultLocale.truncate(defaultLocale.lastIndexOf('_')); // e.g. "de"
-- langPath_ = QApplication::applicationDirPath();
-- langPath_.append("/res");
-- QDir dir(langPath_);
-- QStringList fileNames = dir.entryList(QStringList("re-typeset_*.qm"));
-- if( fileNames.size() == 0 ) {
-- ui->menuLanguage->setDisabled( true );
-- } else {
-- for (int i = 0; i < fileNames.size(); ++i) {
-- QString locale;// get locale extracted by filename
-- locale = fileNames[i]; // "TranslationExample_de.qm"
-- locale.truncate(locale.lastIndexOf('.')); // "TranslationExample_de"
-- locale.remove(0, locale.indexOf('_') + 1); // "de"
-- QString lang = QLocale::languageToString(QLocale(locale).language());
-- QIcon ico(QString("%1/%2.png").arg(langPath_).arg(locale));
-- QAction *action = new QAction(ico, lang, this);
-- action->setCheckable(true);
-- action->setData(locale);
-- ui->menuLanguage->addAction(action);
-- langGroup->addAction(action);
-- if (defaultLocale == locale) {// set default translators and language checked
-- action->setChecked(true);
-- }
-- }
-- }
--}
--
- void MainWindow::changeEvent(QEvent * event) {
- if(0 != event) {
- switch(event->type()) {
-diff -Naur re-typeset-1.2.0/re-typeset-src/mainwindow.ui re-typeset-1.2.0.patched/re-typeset-src/mainwindow.ui
---- re-typeset-1.2.0/re-typeset-src/mainwindow.ui 2016-10-13 15:51:19.000000000 -0400
-+++ re-typeset-1.2.0.patched/re-typeset-src/mainwindow.ui 2018-12-26 16:51:03.683711862 -0500
-@@ -757,11 +757,6 @@
- <height>21</height>
- </rect>
- </property>
-- <widget class="QMenu" name="menuLanguage">
-- <property name="title">
-- <string>&amp;Language</string>
-- </property>
-- </widget>
- <widget class="QMenu" name="menuOptions">
- <property name="title">
- <string>Options</string>
diff --git a/office/re-typeset/rm_lang_menu.diff.gz b/office/re-typeset/rm_lang_menu.diff.gz
new file mode 100644
index 0000000000..0e21bf0d3b
--- /dev/null
+++ b/office/re-typeset/rm_lang_menu.diff.gz
Binary files differ
generated by cgit v1.2.3 (git 2.26.2) at 2025-08-01 18:01:14 +0000