[arch-commits] Commit in papyros-terminal/trunk (PKGBUILD libpapyros-0.2.patch)
Felix Yan
fyan at archlinux.org
Sun Feb 7 01:33:05 UTC 2016
Date: Sunday, February 7, 2016 @ 02:33:05
Author: fyan
Revision: 160497
upgpkg: papyros-terminal 0.1.1-1
Modified:
papyros-terminal/trunk/PKGBUILD
Deleted:
papyros-terminal/trunk/libpapyros-0.2.patch
----------------------+
PKGBUILD | 12 +--
libpapyros-0.2.patch | 166 -------------------------------------------------
2 files changed, 4 insertions(+), 174 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-02-07 01:21:14 UTC (rev 160496)
+++ PKGBUILD 2016-02-07 01:33:05 UTC (rev 160497)
@@ -3,8 +3,8 @@
# Contributor: Michael Spencer <sonrisesoftware at gmail.com>
pkgname=papyros-terminal
-pkgver=0.1.0
-pkgrel=2
+pkgver=0.1.1
+pkgrel=1
pkgdesc="The terminal app for Papyros"
arch=("i686" "x86_64")
url="https://github.com/papyros/terminal-app"
@@ -12,16 +12,12 @@
depends=("qt5-base" "qt5-declarative" "qml-material" "qmltermwidget"
"libpapyros")
makedepends=("git" "extra-cmake-modules")
-source=("git+https://github.com/papyros/terminal-app.git#tag=v$pkgver"
- libpapyros-0.2.patch)
-sha256sums=('SKIP'
- '6c9720692749854672a5aec2e47afead17b836fddeaa65a67749e941170c2cdc')
+source=("git+https://github.com/papyros/terminal-app.git#tag=v$pkgver")
+sha256sums=('SKIP')
prepare() {
mkdir -p build
sed -i 's/Roboto Mono for Powerline/Monospace/' terminal-app/src/qml/Settings.qml
-
- (cd terminal-app; patch -p1 -i ../libpapyros-0.2.patch)
}
build() {
Deleted: libpapyros-0.2.patch
===================================================================
--- libpapyros-0.2.patch 2016-02-07 01:21:14 UTC (rev 160496)
+++ libpapyros-0.2.patch 2016-02-07 01:33:05 UTC (rev 160497)
@@ -1,166 +0,0 @@
-From 80c97ff9ed34fb2b2a4a53f8f0ed3d26334ab5a1 Mon Sep 17 00:00:00 2001
-From: Michael Spencer <sonrisesoftware at gmail.com>
-Date: Mon, 18 Jan 2016 21:26:46 -0600
-Subject: [PATCH] Depend on the new Papyros.Core QML module instead of
- registering it ourselves
-
----
- src/CMakeLists.txt | 3 +--
- src/clipboard.cpp | 31 -------------------------------
- src/clipboard.h | 38 --------------------------------------
- src/main.cpp | 8 --------
- src/qml/Settings.qml | 2 +-
- src/qml/main.qml | 2 +-
- 6 files changed, 3 insertions(+), 81 deletions(-)
- delete mode 100644 src/clipboard.cpp
- delete mode 100644 src/clipboard.h
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 221ef4a..318d7c5 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -5,8 +5,7 @@ target_link_libraries(papyros-terminal
- Qt5::Core
- Qt5::Qml
- Qt5::Quick
-- Qt5::Widgets
-- Papyros::Papyros)
-+ Qt5::Widgets)
-
- install(TARGETS papyros-terminal
- DESTINATION ${CMAKE_INSTALL_BINDIR})
-diff --git a/src/clipboard.cpp b/src/clipboard.cpp
-deleted file mode 100644
-index 8fe79ea..0000000
---- a/src/clipboard.cpp
-+++ /dev/null
-@@ -1,31 +0,0 @@
--/*
-- * Papyros Terminal - The terminal app for Papyros following Material Design
-- * Copyright (C) 2016 Michael Spencer <sonrisesoftware at gmail.com>
-- *
-- * This program 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 3 of the License, or
-- * (at your option) any later version.
-- *
-- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
-- */
--
--#include "clipboard.h"
--
--#include <QApplication>
--
--Clipboard::Clipboard(QObject *parent) : QObject(parent), m_clipboard(QApplication::clipboard())
--{
-- // Nothing needed here
--}
--
--QString Clipboard::text() const
--{
-- return m_clipboard->text();
--}
-diff --git a/src/clipboard.h b/src/clipboard.h
-deleted file mode 100644
-index 241c053..0000000
---- a/src/clipboard.h
-+++ /dev/null
-@@ -1,38 +0,0 @@
--/*
-- * Papyros Terminal - The terminal app for Papyros following Material Design
-- * Copyright (C) 2016 Michael Spencer <sonrisesoftware at gmail.com>
-- *
-- * This program 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 3 of the License, or
-- * (at your option) any later version.
-- *
-- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
-- */
--
--#ifndef CLIPBOARD_H
--#define CLIPBOARD_H
--
--#include <QObject>
--#include <QClipboard>
--
--class Clipboard : public QObject
--{
-- Q_OBJECT
--
--public:
-- explicit Clipboard(QObject *parent = 0);
--
-- Q_INVOKABLE QString text() const;
--
--private:
-- QClipboard *m_clipboard = nullptr;
--};
--
--#endif // ACTION_HANDLER_H
-diff --git a/src/main.cpp b/src/main.cpp
-index f855e5d..9c39a9c 100644
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -20,10 +20,8 @@
- #include <QApplication>
- #include <QQmlApplicationEngine>
- #include <QQmlContext>
--#include <Papyros/KQuickConfig>
-
- #include "ActionHandler.h"
--#include "clipboard.h"
-
- int main(int argc, char *argv[])
- {
-@@ -40,12 +38,6 @@ int main(int argc, char *argv[])
- // Set the X11 WML_CLASS so X11 desktops can find the desktop file
- qputenv("RESOURCE_NAME", "io.papyros.Terminal");
-
-- // TODO: Remove after we add a QML module directly to Papyros.Core
-- qmlRegisterType<KQuickConfig>("Papyros.Core", 0, 1, "KQuickConfig");
--
-- // TODO: Move this to Papyros.Core
-- qmlRegisterType<Clipboard>("Papyros.Core", 0, 1, "Clipboard");
--
- QQmlApplicationEngine engine;
-
- ActionHandler actionHandler(argv[0]);
-diff --git a/src/qml/Settings.qml b/src/qml/Settings.qml
-index 8b8b049..0eff7e4 100644
---- a/src/qml/Settings.qml
-+++ b/src/qml/Settings.qml
-@@ -16,7 +16,7 @@
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
--import Papyros.Core 0.1
-+import Papyros.Core 0.2
-
- KQuickConfig {
- id: settings
-diff --git a/src/qml/main.qml b/src/qml/main.qml
-index 272e6eb..d366a54 100644
---- a/src/qml/main.qml
-+++ b/src/qml/main.qml
-@@ -22,7 +22,7 @@ import QtQuick.Window 2.2
- import QMLTermWidget 1.0
- import Material 0.2
- import QtQuick.Layouts 1.1
--import Papyros.Core 0.1
-+import Papyros.Core 0.2
-
- ApplicationWindow {
- id: mainWindow
More information about the arch-commits
mailing list