commit tea for openSUSE:Factory
Hello community, here is the log from the commit of package tea for openSUSE:Factory checked in at 2020-09-29 19:04:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tea (Old) and /work/SRC/openSUSE:Factory/.tea.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tea" Tue Sep 29 19:04:20 2020 rev:10 rq:838398 version:50.0.4 Changes: -------- --- /work/SRC/openSUSE:Factory/tea/tea.changes 2019-12-09 21:34:56.670104742 +0100 +++ /work/SRC/openSUSE:Factory/.tea.new.4249/tea.changes 2020-09-29 19:04:25.617964708 +0200 @@ -1,0 +2,6 @@ +Mon Sep 28 16:46:20 UTC 2020 - Dirk Mueller <dmueller@suse.com> + +- update to 50.0.4: + * single application mode - fixed. + +------------------------------------------------------------------- Old: ---- tea-qt-50.0.3.tar.gz New: ---- tea-qt-50.0.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tea.spec ++++++ --- /var/tmp/diff_new_pack.Eggk5x/_old 2020-09-29 19:04:26.201965418 +0200 +++ /var/tmp/diff_new_pack.Eggk5x/_new 2020-09-29 19:04:26.205965423 +0200 @@ -1,7 +1,7 @@ # # spec file for package tea # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: tea -Version: 50.0.3 +Version: 50.0.4 Release: 0 Summary: Qt-based text editor with image viewer License: GPL-3.0-or-later ++++++ tea-qt-50.0.3.tar.gz -> tea-qt-50.0.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tea-qt-50.0.3/CMakeLists.txt new/tea-qt-50.0.4/CMakeLists.txt --- old/tea-qt-50.0.3/CMakeLists.txt 2019-12-06 18:39:16.000000000 +0100 +++ new/tea-qt-50.0.4/CMakeLists.txt 2019-12-10 14:07:17.000000000 +0100 @@ -7,7 +7,7 @@ set(PROJECT "tea-qt") -project ($PROJECT VERSION 50.0.3) +project ($PROJECT VERSION 50.0.4) add_definitions(-DVERSION_NUMBER="\\"${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}\\"") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tea-qt-50.0.3/ChangeLog new/tea-qt-50.0.4/ChangeLog --- old/tea-qt-50.0.3/ChangeLog 2019-12-06 18:39:16.000000000 +0100 +++ new/tea-qt-50.0.4/ChangeLog 2019-12-10 14:07:17.000000000 +0100 @@ -1,5 +1,9 @@ //it's lazy updated file, so the real ChangeLog is the activity on github ++ os2:: single application mode +* so2:: tea-qmake.pro is destined to Qt5 now +* single application mode - fixed on UNIX/Win + * fixes cmake file for install icons and desktop file * OS/2 fix diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tea-qt-50.0.3/NEWS new/tea-qt-50.0.4/NEWS --- old/tea-qt-50.0.3/NEWS 2019-12-06 18:39:16.000000000 +0100 +++ new/tea-qt-50.0.4/NEWS 2019-12-10 14:07:17.000000000 +0100 @@ -1,17 +1,13 @@ =====NEWS ABOUT TEA==== -TEA 50.0.0, november 2019 +TEA 50.0.4, december 2019 --------------------------------------- - VISIBLE + HELLO WORLD - Meet the new, alternative Docked interface. Switch between two UI's using Tune::Interface::UI Mode - Classic/Docked. With the Docked one, you can move FIF and Logmemo freely inside or outside the main window. - Another new option is Tune::Interface::UI Language list, which come instead of the removed "Override locale" option. - All those options requires to restart TEA to be applied. + All plaforms:: single application mode - fixed. - UNDER THE HOOD + OS/2:: single application mode - works. qmake project is for Qt5 now. - Some parts of TEA now work faster due to iterator-based cycles optimization. - The Windows-specific module (with the local server) for the "single application" mode has been removed, now TEA uses shared memory based module for all systems excepting OS/2. So QtNetwork dependency has been dropped. TEA RELEASE URL @@ -19,11 +15,6 @@ https://github.com/psemiletov/tea-qt/releases The traditional good old almost hand-made tarballs from semiletov.org and tea.ourproject.org were be sacrificed to the unification and modern frameworks. - OTHER CHANGES/FIXES - -* cmake's make dist creates tarball with dirname as at github, i.e. tea-qt-<ver> -* code cleanup after cppcheck advices - Stay tuned. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tea-qt-50.0.3/NEWS-RU new/tea-qt-50.0.4/NEWS-RU --- old/tea-qt-50.0.3/NEWS-RU 2019-12-06 18:39:16.000000000 +0100 +++ new/tea-qt-50.0.4/NEWS-RU 2019-12-10 14:07:17.000000000 +0100 @@ -1,19 +1,12 @@ =====НОВОСТИ ПРО ТИА==== -ТИА 50.0.0, ноябрь 2019 +ТИА 50.0.4, декабрь 2019 --------------------------------------- - - ЗРИМОЕ - - Появился новый, альтернативный интерфейс под названием "Стыковка". По умолчанию он выключен, переключиться можно в Наладка - Интерфейс - Режим интерфейса. Я давно собирался такое сделать, но останавливала привычка ко классическому интерфейсу. А когда я понял, что можно не отказываться от последнего, а предложить на выбор два - дело пошло. В стыковочном режиме, Логмемо и Знаменитое поле ввода можно перемещать внутри главного окна либо вообще выносить за его пределы в качестве отдельных окон, и это состояние запоминается между запусками ТИА. - На той же вкладке настроек появилась опция "Язык интерфейса", заменяющая старую "Переопределить локаль". - И режим, и язык вступают в силу после перезапуска ТИА. - - НЕЗРИМОЕ - - Разные части ТИА по идее теперь быстрее работают за счет оптимизации циклов, связанных с итераторами. - Изменения в коде, отвечающем за одновременный запуск одной только копии ТИА - вместо отдельного модуля, написанного для работы под Windows, все системы (кроме OS/2) используют теперь универсальный модуль, который раньше использовался только под Юникс-подобными системами и задействует разделяемую память. Таким образом ТИА теперь не зависит от модуля QtNetwork, от которого нужна была реализация локального сервера. - После обработки исходников утилитой cppcheck я исправил некоторые неряшливости в коде. + ПРИВЕТ! + + В этой версии исправлен запуск ТИА в режиме "одной копии", который недавно сломался. + Также этот режим заработал по умолчанию в OS/2. Для OS/2 ТИА теперь компилируется с Qt5. + ЗАМЕТКИ ДЛЯ ВЕДУЩИХ ПАКЕТОВ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tea-qt-50.0.3/TODO new/tea-qt-50.0.4/TODO --- old/tea-qt-50.0.3/TODO 2019-12-06 18:39:16.000000000 +0100 +++ new/tea-qt-50.0.4/TODO 2019-12-10 14:07:17.000000000 +0100 @@ -1,3 +1,4 @@ +OS/2::File manager, double click on folders work with the right double click only галерея шрифтов не работает в Qt 5.13+ Arch/Manjaro shift-up/dn для выделения не работает, и никогда не работала diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tea-qt-50.0.3/main.cpp new/tea-qt-50.0.4/main.cpp --- old/tea-qt-50.0.3/main.cpp 2019-12-06 18:39:16.000000000 +0100 +++ new/tea-qt-50.0.4/main.cpp 2019-12-10 14:07:17.000000000 +0100 @@ -25,9 +25,7 @@ #include "rvln.h" -#ifndef Q_OS_OS2 #include "single_application_shared.h" -#endif extern rvln *mainWindow; @@ -35,7 +33,7 @@ int main (int argc, char *argv[]) { -#if defined(Q_OS_OS2) || defined (NO_SINGLE_APP) +#if defined (NO_SINGLE_APP) QApplication app (argc, argv); qApp->setApplicationName ("TEA"); @@ -45,13 +43,7 @@ return app.exec(); -#endif - - - -#if !defined(Q_OS_OS2) || defined (NO_SINGLE_APP) - - +#else CSingleApplicationShared app (argc, argv, "tea unique id 1977"); bool single_mode = true; @@ -70,15 +62,14 @@ return 0; } -#endif +#endif mainWindow = new rvln(); - -#if !defined(Q_OS_OS2) || defined (NO_SINGLE_APP) +#if !defined (NO_SINGLE_APP) QObject::connect(&app, SIGNAL(messageAvailable(QStringList)), mainWindow, SLOT(receiveMessageShared(QStringList))); // QObject::connect(&app, SIGNAL(signal_commit_data()), mainWindow, SLOT(app_commit_data())); // QObject::connect(&app, SIGNAL(commitDataRequest(QSessionManager & )), mainWindow, SLOT(slot_commitDataRequest(QSessionManager & ))); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tea-qt-50.0.3/meson.build new/tea-qt-50.0.4/meson.build --- old/tea-qt-50.0.3/meson.build 2019-12-06 18:39:16.000000000 +0100 +++ new/tea-qt-50.0.4/meson.build 2019-12-10 14:07:17.000000000 +0100 @@ -1,9 +1,9 @@ project('tea', ['cpp','c'], default_options : ['cpp_std=c++11'], - version : '50.0.3', + version : '50.0.4', license : 'GPLv3') -add_global_arguments('-DVERSION_NUMBER="50.0.3"', language : 'cpp') +add_global_arguments('-DVERSION_NUMBER="50.0.4"', language : 'cpp') #add_global_arguments('-DUSE_QML_STUFF=1', language : 'cpp') #harcoded for now diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tea-qt-50.0.3/single_application_shared.cpp new/tea-qt-50.0.4/single_application_shared.cpp --- old/tea-qt-50.0.3/single_application_shared.cpp 2019-12-06 18:39:16.000000000 +0100 +++ new/tea-qt-50.0.4/single_application_shared.cpp 2019-12-10 14:07:17.000000000 +0100 @@ -17,8 +17,6 @@ CSingleApplicationShared::CSingleApplicationShared (int &argc, char *argv[], const QString uniqueKey): QApplication (argc, argv) { -#ifndef Q_OS_OS2 - // qDebug() << "CSingleApplicationShared::CSingleApplicationShared"; sharedMemory.setKey(uniqueKey); @@ -44,8 +42,7 @@ bAlreadyExists = true; //else // ;// error - -#endif + } @@ -53,7 +50,6 @@ void CSingleApplicationShared::checkForMessage() { -#ifndef Q_OS_OS2 QStringList arguments; @@ -76,13 +72,11 @@ sharedMemory.unlock(); if (arguments.size()) emit messageAvailable (arguments); -#endif } bool CSingleApplicationShared::sendMessage (const QString &message) { -#ifndef Q_OS_OS2 //we cannot send message if we are master process! if (isMasterApp()) @@ -107,7 +101,6 @@ memcpy (to, from, qMin(sharedMemory.size(), byteArray.size())); sharedMemory.unlock(); -#endif return true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tea-qt-50.0.3/single_application_shared.h new/tea-qt-50.0.4/single_application_shared.h --- old/tea-qt-50.0.3/single_application_shared.h 2019-12-06 18:39:16.000000000 +0100 +++ new/tea-qt-50.0.4/single_application_shared.h 2019-12-10 14:07:17.000000000 +0100 @@ -11,9 +11,7 @@ #include <QApplication> #include <QStringList> -#ifndef Q_OS_OS2 #include <QSharedMemory> -#endif class CSingleApplicationShared: public QApplication @@ -22,9 +20,7 @@ private: -#ifndef Q_OS_OS2 QSharedMemory sharedMemory; -#endif bool bAlreadyExists; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tea-qt-50.0.3/tea-qmake.pro new/tea-qt-50.0.4/tea-qmake.pro --- old/tea-qt-50.0.3/tea-qmake.pro 2019-12-06 18:39:16.000000000 +0100 +++ new/tea-qt-50.0.4/tea-qmake.pro 2019-12-10 14:07:17.000000000 +0100 @@ -1,7 +1,7 @@ -VERSION = 50.0.3 +VERSION = 50.0.4 os2: { -DEFINES += 'VERSION_NUMBER=\'"50.0.3"\'' +DEFINES += 'VERSION_NUMBER=\'"50.0.4"\'' } else: { DEFINES += 'VERSION_NUMBER=\\\"$${VERSION}\\\"' } @@ -421,41 +421,47 @@ os2: { - -usepoppler{ -exists("C:/usr/include/poppler/qt4/poppler-qt4.h") { - message ("PDF enabled") - PKGCONFIG += poppler-qt4 - DEFINES += POPPLER_ENABLE -} -} +system(pkg-config --exists zlib) { + message ("Zlib found") + PKGCONFIG += zlib + } -usedjvu{ -exists("C:/usr/include/libdjvu/ddjvuapi.h") { -exists("C:/usr/include/libdjvu/miniexp.h") { - message ("djvu enabled") - PKGCONFIG += ddjvuapi - DEFINES += DJVU_ENABLE -} -} -} - contains(USE_ASPELL,true){ exists("c:/usr/include/aspell.h") { message ("ASpell enabled") LIBS += -laspell_dll DEFINES += ASPELL_ENABLE -contains(USE_HUNSPELL,true) } } -exists("c:/extras/include/hunspell/hunspell.hxx") { - message ("hunspell enabled") - LIBS += -lhunspell-1.4 - PKGCONFIG += hunspell - DEFINES += HUNSPELL_ENABLE + +contains(USE_HUNSPELL,true){ +system(pkg-config --exists hunspell) { +message ("hunspell enabled") + PKGCONFIG += hunspell + DEFINES += HUNSPELL_ENABLE + } + } + +usepoppler{ +system(pkg-config --exists poppler-qt5) { + message ("Poppler enabled") + PKGCONFIG += poppler-qt5 + DEFINES += POPPLER_ENABLE + } +} + + +usedjvu{ +system(pkg-config --exists ddjvuapi) { + message ("djvu enabled") + PKGCONFIG += ddjvuapi + DEFINES += DJVU_ENABLE + } } + + } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tea-qt-50.0.3/tio.cpp new/tea-qt-50.0.4/tio.cpp --- old/tea-qt-50.0.3/tio.cpp 2019-12-06 18:39:16.000000000 +0100 +++ new/tea-qt-50.0.4/tio.cpp 2019-12-10 14:07:17.000000000 +0100 @@ -52,8 +52,8 @@ //FIXME: not good with cmake, cmake just use Qt5 here -#if defined (POPPLER_ENABLE) || defined(Q_OS_OS2) - +//#if defined (POPPLER_ENABLE) || defined(Q_OS_OS2) +#if defined (POPPLER_ENABLE) #if QT_VERSION_MAJOR >= 5 #include <poppler-qt5.h> #else @@ -63,7 +63,7 @@ #endif -#if defined (DJVU_ENABLE) || defined(Q_OS_OS2) +#if defined (DJVU_ENABLE) #include <stddef.h> #include <stdlib.h> #include <stdio.h> @@ -210,11 +210,11 @@ list.push_back (new CTioRTF); list.push_back (new CTioEpub); -#if defined (POPPLER_ENABLE) || defined(Q_OS_OS2) +#if defined (POPPLER_ENABLE) list.push_back (new CTioPDF); #endif -#if defined (DJVU_ENABLE) || defined(Q_OS_OS2) +#if defined (DJVU_ENABLE) list.push_back (new CTioDJVU); #endif } @@ -833,7 +833,7 @@ return true; } -#if defined (POPPLER_ENABLE) || defined(Q_OS_OS2) +#if defined (POPPLER_ENABLE) CTioPDF::CTioPDF() { @@ -881,7 +881,7 @@ #endif -#if defined (DJVU_ENABLE) || defined(Q_OS_OS2) +#if defined (DJVU_ENABLE) const char *detail = 0; int escape = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tea-qt-50.0.3/tio.h new/tea-qt-50.0.4/tio.h --- old/tea-qt-50.0.3/tio.h 2019-12-06 18:39:16.000000000 +0100 +++ new/tea-qt-50.0.4/tio.h 2019-12-10 14:07:17.000000000 +0100 @@ -159,7 +159,7 @@ -#if defined(POPPLER_ENABLE) || defined(Q_OS_OS2) +#if defined(POPPLER_ENABLE) class CTioPDF: public CTioReadOnly { @@ -174,7 +174,7 @@ #endif -#if defined(DJVU_ENABLE) || defined(Q_OS_OS2) +#if defined(DJVU_ENABLE) class CTioDJVU: public CTioReadOnly { Q_OBJECT
participants (1)
-
root