Compare commits
3 Commits
ubuntu/nob
...
ubuntu/plu
Author | SHA1 | Date | |
---|---|---|---|
|
217d71ba43 | ||
|
fed35d17a8 | ||
|
d418d68a29 |
@ -9,8 +9,7 @@ set(CMAKE_AUTORCC ON)
|
|||||||
set(CMAKE_CXX_STANDARD 17)
|
set(CMAKE_CXX_STANDARD 17)
|
||||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||||
|
|
||||||
find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets DBus LinguistTools)
|
find_package(Qt6 REQUIRED COMPONENTS Widgets DBus LinguistTools)
|
||||||
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets DBus LinguistTools)
|
|
||||||
|
|
||||||
set(TS_FILES
|
set(TS_FILES
|
||||||
src/translations/lubuntu-update_en_US.ts
|
src/translations/lubuntu-update_en_US.ts
|
||||||
@ -50,8 +49,8 @@ set(PROJECT_SOURCES
|
|||||||
set(TRANSLATION_RESOURCES "src/translations.qrc")
|
set(TRANSLATION_RESOURCES "src/translations.qrc")
|
||||||
|
|
||||||
configure_file(${TRANSLATION_RESOURCES} translations.qrc COPYONLY)
|
configure_file(${TRANSLATION_RESOURCES} translations.qrc COPYONLY)
|
||||||
qt5_add_translation(QM_FILES ${TS_FILES})
|
qt6_add_translation(QM_FILES ${TS_FILES})
|
||||||
qt5_add_resources(QM_RESOURCES ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc)
|
qt6_add_resources(QM_RESOURCES ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc)
|
||||||
|
|
||||||
add_custom_target(translations ALL DEPENDS ${QM_FILES})
|
add_custom_target(translations ALL DEPENDS ${QM_FILES})
|
||||||
|
|
||||||
@ -64,8 +63,8 @@ add_executable(lubuntu-update
|
|||||||
add_dependencies(lubuntu-update translations)
|
add_dependencies(lubuntu-update translations)
|
||||||
|
|
||||||
target_link_libraries(lubuntu-update PRIVATE
|
target_link_libraries(lubuntu-update PRIVATE
|
||||||
Qt${QT_VERSION_MAJOR}::Widgets
|
Qt6::Widgets
|
||||||
Qt${QT_VERSION_MAJOR}::DBus)
|
Qt6::DBus)
|
||||||
|
|
||||||
install(TARGETS lubuntu-update
|
install(TARGETS lubuntu-update
|
||||||
BUNDLE DESTINATION .
|
BUNDLE DESTINATION .
|
||||||
|
12
debian/changelog
vendored
12
debian/changelog
vendored
@ -1,3 +1,15 @@
|
|||||||
|
lubuntu-update-notifier (1.1.1) plucky; urgency=medium
|
||||||
|
|
||||||
|
* Switch debconf frontend to noninteractive. (LP: #2091704)
|
||||||
|
|
||||||
|
-- Aaron Rainbolt <arraybolt3@ubuntu.com> Tue, 24 Dec 2024 13:51:28 -0600
|
||||||
|
|
||||||
|
lubuntu-update-notifier (1.1.0) oracular; urgency=medium
|
||||||
|
|
||||||
|
* Port to Qt6.
|
||||||
|
|
||||||
|
-- Aaron Rainbolt <arraybolt3@ubuntu.com> Thu, 15 Aug 2024 16:58:41 -0500
|
||||||
|
|
||||||
lubuntu-update-notifier (1.0.0) noble; urgency=medium
|
lubuntu-update-notifier (1.0.0) noble; urgency=medium
|
||||||
|
|
||||||
* Change from beta to final release.
|
* Change from beta to final release.
|
||||||
|
4
debian/control
vendored
4
debian/control
vendored
@ -5,8 +5,8 @@ Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
|
|||||||
Build-Depends: cmake,
|
Build-Depends: cmake,
|
||||||
debhelper-compat (= 13),
|
debhelper-compat (= 13),
|
||||||
lxqt-sudo (>= 1.4.0-0ubuntu2),
|
lxqt-sudo (>= 1.4.0-0ubuntu2),
|
||||||
qtbase5-dev,
|
qt6-base-dev,
|
||||||
qttools5-dev
|
qt6-tools-dev
|
||||||
Standards-Version: 4.6.2
|
Standards-Version: 4.6.2
|
||||||
Rules-Requires-Root: no
|
Rules-Requires-Root: no
|
||||||
|
|
||||||
|
1
debian/files
vendored
Normal file
1
debian/files
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
lubuntu-update-notifier_1.1.0~ppa1_source.buildinfo admin optional
|
@ -88,10 +88,10 @@ void AptManager::handleUpdateProcessBuffer()
|
|||||||
// yes, this gave me a headache also
|
// yes, this gave me a headache also
|
||||||
if (dlLineMatch.hasMatch()) { // Increments the progress counter for each package downloaded
|
if (dlLineMatch.hasMatch()) { // Increments the progress counter for each package downloaded
|
||||||
internalUpdateProgress++;
|
internalUpdateProgress++;
|
||||||
} else if (line.count() >= 25 && line.left(24) == "Preparing to unpack .../" && numPackagesToPrep != 0) {
|
} else if (line.length() >= 25 && line.left(24) == "Preparing to unpack .../" && numPackagesToPrep != 0) {
|
||||||
internalUpdateProgress++; // Increments the progress counter for each package that is "prepared to unpack"
|
internalUpdateProgress++; // Increments the progress counter for each package that is "prepared to unpack"
|
||||||
numPackagesToPrep--;
|
numPackagesToPrep--;
|
||||||
} else if (line.count() >= 10 && line.left(9) == "Unpacking") {
|
} else if (line.length() >= 10 && line.left(9) == "Unpacking") {
|
||||||
/*
|
/*
|
||||||
* Increments the progress counter for each package that is unpacked
|
* Increments the progress counter for each package that is unpacked
|
||||||
* The package name may be suffixed with ":amd64" or some other
|
* The package name may be suffixed with ":amd64" or some other
|
||||||
@ -109,7 +109,7 @@ void AptManager::handleUpdateProcessBuffer()
|
|||||||
internalUpdateProgress++;
|
internalUpdateProgress++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (line.count() >= 11 && line.left(10) == "Setting up") {
|
} else if (line.length() >= 11 && line.left(10) == "Setting up") {
|
||||||
QStringList parts = line.split(' ');
|
QStringList parts = line.split(' ');
|
||||||
QString packageName;
|
QString packageName;
|
||||||
if (parts.count() >= 3) {
|
if (parts.count() >= 3) {
|
||||||
@ -118,7 +118,7 @@ void AptManager::handleUpdateProcessBuffer()
|
|||||||
internalUpdateProgress++;
|
internalUpdateProgress++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (line.count() >= 9 && line.left(8) == "Removing") {
|
} else if (line.length() >= 9 && line.left(8) == "Removing") {
|
||||||
QStringList parts = line.split(' ');
|
QStringList parts = line.split(' ');
|
||||||
QString packageName;
|
QString packageName;
|
||||||
if (parts.count() >= 2) {
|
if (parts.count() >= 2) {
|
||||||
@ -136,7 +136,7 @@ void AptManager::handleUpdateProcessBuffer()
|
|||||||
}
|
}
|
||||||
aptProcess->readLine(lineBuf, 2048);
|
aptProcess->readLine(lineBuf, 2048);
|
||||||
QString confLine = QString(lineBuf);
|
QString confLine = QString(lineBuf);
|
||||||
confLine = confLine.left(confLine.count() - 2);
|
confLine = confLine.left(confLine.length() - 2);
|
||||||
if (confLine == "Lubuntu Update !!! CONFIGURATION FILE LIST END") {
|
if (confLine == "Lubuntu Update !!! CONFIGURATION FILE LIST END") {
|
||||||
emit conffileListReady(conffileList); // this triggers the main window to show the conffile handler window
|
emit conffileListReady(conffileList); // this triggers the main window to show the conffile handler window
|
||||||
break;
|
break;
|
||||||
@ -151,7 +151,7 @@ void AptManager::handleUpdateProcessBuffer()
|
|||||||
}
|
}
|
||||||
aptProcess->readLine(lineBuf, 2048);
|
aptProcess->readLine(lineBuf, 2048);
|
||||||
QString releaseCode = QString(lineBuf);
|
QString releaseCode = QString(lineBuf);
|
||||||
releaseCode = releaseCode.left(releaseCode.count() - 2);
|
releaseCode = releaseCode.left(releaseCode.length() - 2);
|
||||||
emit newRelease(releaseCode);
|
emit newRelease(releaseCode);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -246,7 +246,7 @@ QList<QStringList> AptManager::getUpdateInfo()
|
|||||||
* spaces, we know we're no longer reading a package list.
|
* spaces, we know we're no longer reading a package list.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if (stdoutLine.count() < 3 || stdoutLine.left(2) != " ") {
|
if (stdoutLine.length() < 3 || stdoutLine.left(2) != " ") {
|
||||||
gettingInstallPackages = false;
|
gettingInstallPackages = false;
|
||||||
gettingUpgradePackages = false;
|
gettingUpgradePackages = false;
|
||||||
gettingUninstallPackages = false;
|
gettingUninstallPackages = false;
|
||||||
@ -317,7 +317,7 @@ QStringList AptManager::getSecurityUpdateList()
|
|||||||
QString distroLine;
|
QString distroLine;
|
||||||
while (distroFinder.readLineInto(&distroLine)) {
|
while (distroFinder.readLineInto(&distroLine)) {
|
||||||
// The line has to be at least 18 characters long - 16 for the string "DISTRIB_CODENAME", one for the = sign, and one for a codename with a length of at least one.
|
// The line has to be at least 18 characters long - 16 for the string "DISTRIB_CODENAME", one for the = sign, and one for a codename with a length of at least one.
|
||||||
if (distroLine.count() >= 18 && distroLine.left(16) == "DISTRIB_CODENAME") {
|
if (distroLine.length() >= 18 && distroLine.left(16) == "DISTRIB_CODENAME") {
|
||||||
QStringList distroParts = distroLine.split('=');
|
QStringList distroParts = distroLine.split('=');
|
||||||
if (distroParts.count() >= 2) {
|
if (distroParts.count() >= 2) {
|
||||||
distroName = distroParts[1];
|
distroName = distroParts[1];
|
||||||
|
@ -66,7 +66,7 @@ elif [ "$1" = 'doupdate' ]; then
|
|||||||
dpkg --configure -a
|
dpkg --configure -a
|
||||||
|
|
||||||
# Run the real update
|
# Run the real update
|
||||||
DEBIAN_FRONTEND='kde' apt-get -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold' -o Apt::Color='0' -o Dpkg::Use-Pty='0' -y dist-upgrade |& tee /run/lubuntu-update-apt-log
|
DEBIAN_FRONTEND='noninteractive' apt-get -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold' -o Apt::Color='0' -o Dpkg::Use-Pty='0' -y dist-upgrade |& tee /run/lubuntu-update-apt-log
|
||||||
|
|
||||||
# Find all the conffiles
|
# Find all the conffiles
|
||||||
doConffiles='y';
|
doConffiles='y';
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>462</width>
|
<width>473</width>
|
||||||
<height>600</height>
|
<height>600</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
@ -37,6 +37,9 @@
|
|||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QProgressBar" name="progressBar">
|
<widget class="QProgressBar" name="progressBar">
|
||||||
|
<property name="maximum">
|
||||||
|
<number>100</number>
|
||||||
|
</property>
|
||||||
<property name="value">
|
<property name="value">
|
||||||
<number>0</number>
|
<number>0</number>
|
||||||
</property>
|
</property>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user