[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: gnu: Remove KDE 4.
|
From: |
Andreas Enge |
|
Subject: |
01/02: gnu: Remove KDE 4. |
|
Date: |
Mon, 22 Feb 2016 20:34:47 +0000 |
andreas pushed a commit to branch master
in repository guix.
commit dbbb45dd7318528ea92a56992be789d0b5cf2120
Author: Andreas Enge <address@hidden>
Date: Mon Feb 22 21:05:06 2016 +0100
gnu: Remove KDE 4.
* gnu/packages/kde.scm (qjson): Move from here...
* gnu/packages/qt.scm (qjson): ...to here.
* gnu/packages/pumpio.scm: Drop inclusion of (gnu packages kde).
* gnu/packages/kde.scm: Delete file.
* gnu-system.am (GNU_SYSTEM_MODULES): Unregister it.
* gnu/packages/rdf.scm (soprano): Delete variable.
KDE 4 relies on Qt 4, which does not receive security updates any more.
---
gnu-system.am | 1 -
gnu/packages/kde.scm | 229 -----------------------------------------------
gnu/packages/pumpio.scm | 1 -
gnu/packages/qt.scm | 26 +++++-
gnu/packages/rdf.scm | 31 +------
5 files changed, 26 insertions(+), 262 deletions(-)
diff --git a/gnu-system.am b/gnu-system.am
index 0d297b4..a93b005 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -172,7 +172,6 @@ GNU_SYSTEM_MODULES = \
gnu/packages/jemalloc.scm \
gnu/packages/jrnl.scm \
gnu/packages/julia.scm \
- gnu/packages/kde.scm \
gnu/packages/kde-frameworks.scm \
gnu/packages/key-mon.scm \
gnu/packages/kodi.scm \
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
deleted file mode 100644
index 1409e7c..0000000
--- a/gnu/packages/kde.scm
+++ /dev/null
@@ -1,229 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015 Andreas Enge <address@hidden>
-;;;
-;;; This file is part of GNU Guix.
-;;;
-;;; GNU Guix 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.
-;;;
-;;; GNU Guix 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 GNU Guix. If not, see <http://www.gnu.org/licenses/>.
-
-(define-module (gnu packages kde)
- #:use-module ((guix licenses) #:select (bsd-2 lgpl2.0+ lgpl2.1 lgpl2.1+
lgpl3+))
- #:use-module (guix packages)
- #:use-module (guix download)
- #:use-module (guix build-system cmake)
- #:use-module (gnu packages compression)
- #:use-module (gnu packages doxygen)
- #:use-module (gnu packages geeqie)
- #:use-module (gnu packages glib)
- #:use-module (gnu packages perl)
- #:use-module (gnu packages pkg-config)
- #:use-module (gnu packages pulseaudio)
- #:use-module (gnu packages python)
- #:use-module (gnu packages qt)
- #:use-module (gnu packages rdf)
- #:use-module (gnu packages ruby)
- #:use-module (gnu packages video)
- #:use-module (gnu packages xml)
- #:use-module (gnu packages xorg))
-
-(define-public automoc4
- (package
- (name "automoc4")
- (version "0.9.88")
- (source (origin
- (method url-fetch)
- (uri (string-append "http://download.kde.org/stable/"; name
- "/" version "/" name "-"
- version ".tar.bz2"))
- (sha256
- (base32
- "0jackvg0bdjg797qlbbyf9syylm0qjs55mllhn11vqjsq3s1ch93"))))
- (build-system cmake-build-system)
- (inputs
- `(("qt" ,qt-4)))
- (arguments
- `(#:tests? #f)) ; no check target
- (home-page "http://techbase.kde.org/Development/Tools/Automoc4";)
- (synopsis "Build tool for KDE")
- (description "AutoMoc4 automatically generates moc-files for KDE.")
- (license bsd-2)))
-
-(define-public phonon
- (package
- (name "phonon")
- (version "4.8.3")
- (source (origin
- (method url-fetch)
- (uri (string-append "http://download.kde.org/stable/"; name
- "/" version "/src/"
- name "-" version ".tar.xz"))
- (sha256
- (base32
- "05nshngk03ln90vsjz44dx8al576f4vd5fvhs1l0jmx13jb9q551"))))
- (build-system cmake-build-system)
- ;; FIXME: Add optional input libqzeitgeist once available.
- (native-inputs
- `(("automoc4" ,automoc4)
- ("pkg-config" ,pkg-config)))
- (inputs
- `(("glib" ,glib)
- ("libx11" ,libx11)
- ("pulseaudio" ,pulseaudio)))
- (propagated-inputs
- `(("qt" ,qt-4))) ; according to phonon.pc
- (arguments
- `(#:tests? #f)) ; no test target
- (home-page "http://phonon.kde.org/";)
- (synopsis "Qt 4 multimedia API")
- (description "KDE desktop environment")
- (license lgpl2.1+)))
-
-(define-public qjson
- (package
- (name "qjson")
- (version "0.8.1")
- (source (origin
- (method url-fetch)
- (uri (string-append "https://github.com/flavio/qjson/archive/";
- version ".tar.gz"))
- (file-name (string-append name "-" version ".tar.gz"))
- (sha256
- (base32
- "163fspi0xc705irv79qw861fmh68pjyla9vx3kqiq6xrdhb9834j"))))
- (build-system cmake-build-system)
- (inputs
- `(("qt" ,qt-4)))
- (arguments
- `(#:tests? #f)) ; no test target
- (home-page "http://qjson.sourceforge.net/";)
- (synopsis "Qt-based library for handling JSON")
- (description "QJson is a Qt-based library that maps JSON data to QVariant
-objects and vice versa. JSON arrays are mapped to QVariantList instances,
-while JSON objects are mapped to QVariantMap.")
- (license lgpl2.1+)))
-
-(define-public libdbusmenu-qt
- (package
- (name "libdbusmenu-qt")
- (version "0.9.2")
- (source (origin
- (method url-fetch)
- (uri (string-append "https://launchpad.net/"; name "/trunk/"
- version "/+download/"
- name "-" version ".tar.bz2"))
- (sha256
- (base32
- "1v0ri5g9xw2z64ik0kx0ra01v8rpjn2kxprrxppkls1wvav1qv5f"))))
- (build-system cmake-build-system)
- (native-inputs
- `(("doxygen" ,doxygen) ; used for static documentation
- ("pkg-config" ,pkg-config)
- ("qjson", qjson))) ; used for the tests
- (inputs
- `(("qt" ,qt-4)))
- (arguments
- `(#:tests? #f)) ; no check target
- (home-page "https://launchpad.net/libdbusmenu-qt/";)
- (synopsis "Qt implementation of the DBusMenu protocol")
- (description "The library provides a Qt implementation of the DBusMenu
-protocol. The DBusMenu protocol makes it possible for applications to export
-and import their menus over DBus.")
- (license lgpl2.0+)))
-
-(define-public attica
- (package
- (name "attica")
- (version "0.4.2")
- (source (origin
- (method url-fetch)
- (uri (string-append "http://download.kde.org/stable/";
- name "/"
- name "-" version ".tar.bz2"))
- (sha256
- (base32
- "1y74gsyzi70dfr9d1f1b08k130rm3jaibsppg8dv5h3211vm771v"))))
- (build-system cmake-build-system)
- (inputs
- `(("qt" ,qt-4)))
- (home-page "https://projects.kde.org/projects/frameworks/attica";)
- (synopsis "Qt library for the Open Collaboration Services API")
- (description "Attica is a Qt library that implements the Open
-Collaboration Services API version 1.6. It grants easy access to the
-services such as querying information about persons and contents. The
-library is used in KNewStuff3 as content provider. In order to integrate
-with KDE's Plasma Desktop, a platform plugin exists in kdebase.")
- (license lgpl2.1+)))
-
-(define-public strigi
- (package
- (name "strigi")
- (version "0.7.8")
- (source (origin
- (method url-fetch)
- (uri (string-append "http://www.vandenoever.info/software/";
- name "/"
- name "-" version ".tar.bz2"))
- (sha256
- (base32
- "12grxzqwnvbyqw7q1gnz42lypadxmq89vk2qpxczmpmc4nk63r23"))))
- (build-system cmake-build-system)
- (native-inputs
- `(("pkg-config" ,pkg-config)))
- ;; FIXME: Add optional inputs XAttr, FAM, Log4cxx
- (inputs
- `(("clucene" ,clucene)
- ("dbus" ,dbus)
- ("exiv2" ,exiv2)
- ("ffmpeg" ,ffmpeg)
- ("libxml2" ,libxml2)
- ("perl" ,perl)
- ("python" ,python-wrapper)
- ("qt" ,qt-4)
- ("zlib" ,zlib)))
- (arguments
- `(#:tests? #f)) ; FIXME: Test 23/25 ProcessInputStreamTest fails.
- (home-page "http://www.vandenoever.info/software/strigi/";)
- (synopsis "Desktop search daemon")
- (description "Strigi is a desktop search daemon with the following
-main features:
-very fast crawling;
-very small memory footprint;
-no hammering of the system;
-pluggable backend, currently clucene and hyperestraier, sqlite3 and xapian
-are in the works;
-communication between daemon and search program over an abstract interface,
-currently a simple socket;
-simple interface for implementing plugins for extracting information;
-calculation of sha1 for every file crawled
-(allows fast finding of duplicates).")
- (license lgpl2.0+)))
-
-(define-public oxygen-icons
- (package
- (name "oxygen-icons")
- (version "4.14.2")
- (source (origin
- (method url-fetch)
- (uri (string-append "http://download.kde.org/stable/"; version
- "/src/" name "-"
- version ".tar.xz"))
- (sha256
- (base32
- "1mz73f54qh2vd8ibp60f6fjflrprz0lvqfkgh805l7wfhrv4ckbz"))))
- (build-system cmake-build-system)
- (arguments
- `(#:tests? #f)) ; no test target
- (home-page "http://www.kde.org/";)
- (synopsis "Oxygen icon theme for the KDE desktop")
- (description "KDE desktop environment")
- (license lgpl3+)))
diff --git a/gnu/packages/pumpio.scm b/gnu/packages/pumpio.scm
index 27a1250..8210907 100644
--- a/gnu/packages/pumpio.scm
+++ b/gnu/packages/pumpio.scm
@@ -24,7 +24,6 @@
#:use-module (guix git-download)
#:use-module (guix build-system gnu)
#:use-module (gnu packages aspell)
- #:use-module (gnu packages kde)
#:use-module (gnu packages qt)
#:use-module (gnu packages web))
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index dccc9a2..86c0aaa 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -20,7 +20,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages qt)
- #:use-module ((guix licenses) #:select (bsd-3 gpl2 gpl3 lgpl2.1 x11-style))
+ #:use-module ((guix licenses) #:select (bsd-3 gpl2 gpl3 lgpl2.1 lgpl2.1+
x11-style))
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build utils)
@@ -337,6 +337,30 @@ developers using C++ or QML, a CSS & JavaScript like
language.")
(delete-file-recursively olddoc)
#t))))))))
+(define-public qjson
+ (package
+ (name "qjson")
+ (version "0.8.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/flavio/qjson/archive/";
+ version ".tar.gz"))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "163fspi0xc705irv79qw861fmh68pjyla9vx3kqiq6xrdhb9834j"))))
+ (build-system cmake-build-system)
+ (inputs
+ `(("qt" ,qt-4)))
+ (arguments
+ `(#:tests? #f)) ; no test target
+ (home-page "http://qjson.sourceforge.net/";)
+ (synopsis "Qt-based library for handling JSON")
+ (description "QJson is a Qt-based library that maps JSON data to QVariant
+objects and vice versa. JSON arrays are mapped to QVariantList instances,
+while JSON objects are mapped to QVariantMap.")
+ (license lgpl2.1+)))
+
(define-public python-sip
(package
(name "python-sip")
diff --git a/gnu/packages/rdf.scm b/gnu/packages/rdf.scm
index 13ffa2a..b577e26 100644
--- a/gnu/packages/rdf.scm
+++ b/gnu/packages/rdf.scm
@@ -19,7 +19,7 @@
(define-module (gnu packages rdf)
#:use-module ((guix licenses)
- #:select (non-copyleft isc gpl2 lgpl2.0+ lgpl2.1 lgpl2.1+))
+ #:select (non-copyleft isc gpl2 lgpl2.1 lgpl2.1+))
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system cmake)
@@ -298,35 +298,6 @@ ideal (e.g. in LV2 implementations or embedded
applications).")
"Sord is a lightweight C library for storing RDF data in memory.")
(license isc)))
-(define-public soprano
- (package
- (name "soprano")
- (version "2.9.4")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://sourceforge/soprano/Soprano/"
- version "/"
- "soprano-" version ".tar.bz2"))
- (sha256
- (base32
- "1rg0x7yg0a1cbnxz7kqk52580wla8jbnj4d4r3j7l7g7ajyny1k4"))
- (patches (list (search-patch "soprano-find-clucene.patch")))))
- (build-system cmake-build-system)
- (native-inputs
- `(("doxygen" ,doxygen)
- ("pkg-config" ,pkg-config)))
- (inputs
- `(("clucene" ,clucene)
- ("qt" ,qt-4)
- ("redland" ,redland)))
- (home-page "http://soprano.sourceforge.net/";)
- (synopsis "RDF data library for Qt")
- (description "Soprano (formerly known as QRDF) is a library which
-provides a highly usable object-oriented C++/Qt4 framework for RDF data. It
-uses different RDF storage solutions as backends through a simple plugin
-system.")
- (license lgpl2.0+)))
-
(define-public python-rdflib
(package
(name "python-rdflib")