Commit b40963dd authored by Alf Gaida's avatar Alf Gaida

Cherry-picked upstream release 0.4.0

* Bump lxqt-build-tools to >= 0.5.0~
* Fixed watch file lxde -> lxqt
* Moved .gitignore from debian to ./
* Cleaned up debian/source/options

Adding upstream version 0.4.0.
Signed-off-by: Alf Gaida's avatarAlf Gaida <agaida@siduction.org>
parent 9d608f55
debian/*.debhelper
debian/*.log
debian/*.substvars
debian/debhelper-build-stamp
debian/files
debian/pavucontrol-qt/
pavucontrol-qt-0.3.0 / 2017-09-24
pavucontrol-qt-0.4.0 / 2018-05-21
=================================
* Bumped minor version to 4
* Spanish translation update
* Qt5.11 beta: xxxwidget: include QAction explicitely
* CMake: Prevent in-source builds
* build: Use pkg-config's *_LDFLAGS
* fix http -> https
* Fixed mentions of LXDE
* pavucontrol: Remove unique application constraint
* Add Simplified Chinese desktop entry
0.3.0 / 2017-09-24
==================
* Release 0.3.0: Update changelog
* Bump version to 0.3.0
* correct spelling mistake
* Added Lithuanian .desktop file
......
......@@ -3,7 +3,7 @@ project(pavucontrol-qt)
option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" OFF)
set(LXQTBT_MINIMUM_VERSION "0.4.0")
set(LXQTBT_MINIMUM_VERSION "0.5.0")
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
set(CMAKE_INCLUDE_CURRENT_DIR ON)
......@@ -24,11 +24,12 @@ if(NOT CMAKE_BUILD_TYPE)
endif()
set(PAVUCONTROLQT_MAJOR_VERSION 0)
set(PAVUCONTROLQT_MINOR_VERSION 3)
set(PAVUCONTROLQT_MINOR_VERSION 4)
set(PAVUCONTROLQT_PATCH_VERSION 0)
set(PAVUCONTROLQT_VERSION ${PAVUCONTROLQT_MAJOR_VERSION}.${PAVUCONTROLQT_MINOR_VERSION}.${PAVUCONTROLQT_PATCH_VERSION})
add_definitions("-DPAVUCONTROLQT_VERSION=\"${PAVUCONTROLQT_VERSION}\"")
include(LXQtPreventInSourceBuilds)
include(LXQtCompilerSettings NO_POLICY_SCOPE)
include(LXQtTranslate)
......
......@@ -13,7 +13,7 @@ The software belongs to the LXQt project but its usage isn't limited to this des
### Compiling source code
Runtime dependencies are qtbase and PulseAudio client library libpulse.
Additional build dependencies are CMake and [liblxqt](https://github.com/lxde/liblxqt) as well as optionally Git to pull latest VCS checkouts. The localization files were outsourced to repository [lxqt-l10n](https://github.com/lxde/lxqt-l10n) so the corresponding dependencies are needed, too. Please refer to this repository's `README.md` for further information.
Additional build dependencies are CMake and [liblxqt](https://github.com/lxqt/liblxqt) as well as optionally Git to pull latest VCS checkouts. The localization files were outsourced to repository [lxqt-l10n](https://github.com/lxqt/lxqt-l10n) so the corresponding dependencies are needed, too. Please refer to this repository's `README.md` for further information.
Code configuration is handled by CMake. CMake variable `CMAKE_INSTALL_PREFIX` has to be set to `/usr` on most operating systems.
......
/*.debhelper
/*.log
/*.substvars
/debhelper-build-stamp
/files
/pavucontrol-qt/
pavucontrol-qt (0.4.0-1) unstable; urgency=medium
* Cherry-picked upstream release 0.4.0
* Bump lxqt-build-tools to >= 0.5.0~
* Fixed watch file lxde -> lxqt
* Moved .gitignore from debian to ./
* Cleaned up debian/source/options
-- Alf Gaida <agaida@siduction.org> Wed, 23 May 2018 20:29:30 +0200
pavucontrol-qt (0.3.0-4) unstable; urgency=medium
* Bumped compat to 11
......
......@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 11~),
libpulse-dev,
libqt5svg5-dev,
libqt5x11extras5-dev,
lxqt-build-tools (>= 0.4.0),
lxqt-build-tools (>= 0.5.0~),
xdg-user-dirs
Standards-Version: 4.1.4
Vcs-Browser: https://salsa.debian.org/lxqt-team/pavucontrol-qt
......
......@@ -3,7 +3,7 @@ Upstream-Name: pavucontrol-qt
Source: https://github.com/lxqt/pavucontrol-qt
Files: *
Copyright: 2016-2017 LXQt team
Copyright: 2016-2018 LXQt team
2016-2017 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
2016-2017 Palo Kisa <palo.kisa@gmail.com>
License: GPL-2.0+
......
tar-ignore=.gitignore
tar-ignore=obconf-qt.kdev4
tar-ignore=.gitignore
\ No newline at end of file
......@@ -35,7 +35,6 @@ set(pavucontrol-qt_SRCS
sourceoutputwidget.cc
sourcewidget.cc
streamwidget.cc
uniqueapplication.cc
)
set(pavucontrol-qt_UI
......@@ -84,8 +83,8 @@ set_property(
target_link_libraries(pavucontrol-qt
Qt5::Widgets
Qt5::DBus
${PULSE_LIBRARIES}
${GLIB_LIBRARIES}
${PULSE_LDFLAGS}
${GLIB_LDFLAGS}
)
install(TARGETS
......
......@@ -13,7 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with pavucontrol. If not, see <http://www.gnu.org/licenses/>.
# along with pavucontrol. If not, see <https://www.gnu.org/licenses/>.
desktopdir = $(datadir)/applications
gladedir = $(pkgdatadir)
......
......@@ -15,7 +15,7 @@
General Public License for more details.
You should have received a copy of the GNU General Public License
along with pavucontrol. If not, see <http://www.gnu.org/licenses/>.
along with pavucontrol. If not, see <https://www.gnu.org/licenses/>.
***/
#ifdef HAVE_CONFIG_H
......
......@@ -15,7 +15,7 @@
General Public License for more details.
You should have received a copy of the GNU General Public License
along with pavucontrol. If not, see <http://www.gnu.org/licenses/>.
along with pavucontrol. If not, see <https://www.gnu.org/licenses/>.
***/
#ifndef cardwidget_h
......
......@@ -15,7 +15,7 @@
General Public License for more details.
You should have received a copy of the GNU General Public License
along with pavucontrol. If not, see <http://www.gnu.org/licenses/>.
along with pavucontrol. If not, see <https://www.gnu.org/licenses/>.
***/
#ifdef HAVE_CONFIG_H
......
......@@ -15,7 +15,7 @@
General Public License for more details.
You should have received a copy of the GNU General Public License
along with pavucontrol. If not, see <http://www.gnu.org/licenses/>.
along with pavucontrol. If not, see <https://www.gnu.org/licenses/>.
***/
#ifndef channel_h
......
......@@ -15,7 +15,7 @@
General Public License for more details.
You should have received a copy of the GNU General Public License
along with pavucontrol. If not, see <http://www.gnu.org/licenses/>.
along with pavucontrol. If not, see <https://www.gnu.org/licenses/>.
***/
#ifdef HAVE_CONFIG_H
......@@ -28,6 +28,7 @@
#include "devicewidget.h"
#include "channel.h"
#include <sstream>
#include <QAction>
#include <QLabel>
#include <QMessageBox>
#include <QInputDialog>
......
......@@ -15,7 +15,7 @@
General Public License for more details.
You should have received a copy of the GNU General Public License
along with pavucontrol. If not, see <http://www.gnu.org/licenses/>.
along with pavucontrol. If not, see <https://www.gnu.org/licenses/>.
***/
#ifndef devicewidget_h
......@@ -30,6 +30,7 @@
class MainWindow;
class Channel;
class QAction;
class DeviceWidget : public MinimalStreamWidget, public Ui::DeviceWidget {
Q_OBJECT
......
......@@ -15,7 +15,7 @@
General Public License for more details.
You should have received a copy of the GNU General Public License
along with pavucontrol. If not, see <http://www.gnu.org/licenses/>.
along with pavucontrol. If not, see <https://www.gnu.org/licenses/>.
***/
#ifdef HAVE_CONFIG_H
......
......@@ -15,7 +15,7 @@
General Public License for more details.
You should have received a copy of the GNU General Public License
along with pavucontrol. If not, see <http://www.gnu.org/licenses/>.
along with pavucontrol. If not, see <https://www.gnu.org/licenses/>.
***/
#ifndef mainwindow_h
......
......@@ -15,7 +15,7 @@
General Public License for more details.
You should have received a copy of the GNU General Public License
along with pavucontrol. If not, see <http://www.gnu.org/licenses/>.
along with pavucontrol. If not, see <https://www.gnu.org/licenses/>.
***/
#ifdef HAVE_CONFIG_H
......
......@@ -15,7 +15,7 @@
General Public License for more details.
You should have received a copy of the GNU General Public License
along with pavucontrol. If not, see <http://www.gnu.org/licenses/>.
along with pavucontrol. If not, see <https://www.gnu.org/licenses/>.
***/
#ifndef minimalstreamwidget_h
......
......@@ -15,7 +15,7 @@
General Public License for more details.
You should have received a copy of the GNU General Public License
along with pavucontrol. If not, see <http://www.gnu.org/licenses/>.
along with pavucontrol. If not, see <https://www.gnu.org/licenses/>.
***/
#ifdef HAVE_CONFIG_H
......@@ -49,7 +49,6 @@
#include <QTranslator>
#include <QCommandLineParser>
#include <QCommandLineOption>
#include "uniqueapplication.h"
#include <QString>
static pa_context* context = NULL;
......@@ -647,10 +646,7 @@ int main(int argc, char *argv[]) {
signal(SIGPIPE, SIG_IGN);
UniqueApplication app(argc, argv);
if(app.active())
return 0;
QApplication app(argc, argv);
app.setOrganizationName(QStringLiteral("pavucontrol-qt"));
app.setAttribute(Qt::AA_UseHighDpiPixmaps, true);
......
......@@ -15,7 +15,7 @@
General Public License for more details.
You should have received a copy of the GNU General Public License
along with pavucontrol. If not, see <http://www.gnu.org/licenses/>.
along with pavucontrol. If not, see <https://www.gnu.org/licenses/>.
***/
#ifndef pavucontrol_h
......
......@@ -15,7 +15,7 @@
General Public License for more details.
You should have received a copy of the GNU General Public License
along with pavucontrol. If not, see <http://www.gnu.org/licenses/>.
along with pavucontrol. If not, see <https://www.gnu.org/licenses/>.
***/
#ifdef HAVE_CONFIG_H
......
......@@ -15,7 +15,7 @@
General Public License for more details.
You should have received a copy of the GNU General Public License
along with pavucontrol. If not, see <http://www.gnu.org/licenses/>.
along with pavucontrol. If not, see <https://www.gnu.org/licenses/>.
***/
#ifndef rolewidget_h
......
......@@ -15,7 +15,7 @@
General Public License for more details.
You should have received a copy of the GNU General Public License
along with pavucontrol. If not, see <http://www.gnu.org/licenses/>.
along with pavucontrol. If not, see <https://www.gnu.org/licenses/>.
***/
#ifdef HAVE_CONFIG_H
......
......@@ -15,7 +15,7 @@
General Public License for more details.
You should have received a copy of the GNU General Public License
along with pavucontrol. If not, see <http://www.gnu.org/licenses/>.
along with pavucontrol. If not, see <https://www.gnu.org/licenses/>.
***/
#ifndef sinkinputwidget_h
......@@ -24,6 +24,7 @@
#include "pavucontrol.h"
#include "streamwidget.h"
#include <QAction>
class MainWindow;
class QMenu;
......
......@@ -15,7 +15,7 @@
General Public License for more details.
You should have received a copy of the GNU General Public License
along with pavucontrol. If not, see <http://www.gnu.org/licenses/>.
along with pavucontrol. If not, see <https://www.gnu.org/licenses/>.
***/
#ifdef HAVE_CONFIG_H
......
......@@ -15,7 +15,7 @@
General Public License for more details.
You should have received a copy of the GNU General Public License
along with pavucontrol. If not, see <http://www.gnu.org/licenses/>.
along with pavucontrol. If not, see <https://www.gnu.org/licenses/>.
***/
#ifndef sinkwidget_h
......
......@@ -15,7 +15,7 @@
General Public License for more details.
You should have received a copy of the GNU General Public License
along with pavucontrol. If not, see <http://www.gnu.org/licenses/>.
along with pavucontrol. If not, see <https://www.gnu.org/licenses/>.
***/
#ifdef HAVE_CONFIG_H
......
......@@ -15,7 +15,7 @@
General Public License for more details.
You should have received a copy of the GNU General Public License
along with pavucontrol. If not, see <http://www.gnu.org/licenses/>.
along with pavucontrol. If not, see <https://www.gnu.org/licenses/>.
***/
#ifndef sourceoutputwidget_h
......@@ -24,6 +24,7 @@
#include "pavucontrol.h"
#include "streamwidget.h"
#include <QAction>
class MainWindow;
class QMenu;
......
......@@ -15,7 +15,7 @@
General Public License for more details.
You should have received a copy of the GNU General Public License
along with pavucontrol. If not, see <http://www.gnu.org/licenses/>.
along with pavucontrol. If not, see <https://www.gnu.org/licenses/>.
***/
#ifdef HAVE_CONFIG_H
......
......@@ -15,7 +15,7 @@
General Public License for more details.
You should have received a copy of the GNU General Public License
along with pavucontrol. If not, see <http://www.gnu.org/licenses/>.
along with pavucontrol. If not, see <https://www.gnu.org/licenses/>.
***/
#ifndef sourcewidget_h
......
......@@ -15,7 +15,7 @@
General Public License for more details.
You should have received a copy of the GNU General Public License
along with pavucontrol. If not, see <http://www.gnu.org/licenses/>.
along with pavucontrol. If not, see <https://www.gnu.org/licenses/>.
***/
#ifdef HAVE_CONFIG_H
......@@ -25,7 +25,7 @@
#include "streamwidget.h"
#include "mainwindow.h"
#include "channel.h"
#include <QAction>
/*** StreamWidget ***/
StreamWidget::StreamWidget(MainWindow *parent) :
......
......@@ -15,7 +15,7 @@
General Public License for more details.
You should have received a copy of the GNU General Public License
along with pavucontrol. If not, see <http://www.gnu.org/licenses/>.
along with pavucontrol. If not, see <https://www.gnu.org/licenses/>.
***/
#ifndef streamwidget_h
......@@ -29,6 +29,7 @@
class MainWindow;
class Channel;
class QAction;
class StreamWidget : public MinimalStreamWidget, public Ui::StreamWidget {
Q_OBJECT
......
Name[es]=Control de volumen de PulseAudio
GenericName[es]=Control de volumen
Comment[es]=Ajustar el nivel del volumen
Name[zh_CN]=PulseAudio 音量控制
GenericName[zh_CN]=音量控制
Comment[zh_CN]=调整音量
/***
This file is part of pavucontrol-qt.
Copyright 2006-2008 Lennart Poettering
Copyright 2008 Sjoerd Simons <sjoerd@luon.net>
Copyright 2016 Helio Chissini de Castro <helio@kde.org>
pavucontrol is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
pavucontrol is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License
along with pavucontrol. If not, see <http://www.gnu.org/licenses/>.
***/
#include "uniqueapplication.h"
UniqueApplication::UniqueApplication(int &argc, char **argv)
: QApplication(argc, argv)
{
uniq = new QSharedMemory("pavucontrol-Qt", this);
}
UniqueApplication::~UniqueApplication()
{
if(uniq->isAttached())
uniq->detach();
}
bool UniqueApplication::active()
{
if(uniq->attach(QSharedMemory::ReadOnly)){
uniq->detach();
return true;
}
if(uniq->create(1)){
return false;
}
return true;
}
/***
This file is part of pavucontrol-qt.
Copyright 2006-2008 Lennart Poettering
Copyright 2008 Sjoerd Simons <sjoerd@luon.net>
Copyright 2016 Helio Chissini de Castro <helio@kde.org>
pavucontrol is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
pavucontrol is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License
along with pavucontrol. If not, see <http://www.gnu.org/licenses/>.
***/
#ifndef UNIQUEAPPLICATION_H
#define UNIQUEAPPLICATION_H
#include <QApplication>
#include <QSharedMemory>
class UniqueApplication : public QApplication
{
Q_OBJECT
public:
UniqueApplication(int &argc, char** argv);
~UniqueApplication();
bool active();
private:
QSharedMemory *uniq;
};
#endif // UNIQUEAPPLICATION_H
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment