[packages/libqtxdg] - added two patches from git - rel 0.2
witekfl
witekfl at pld-linux.org
Wed May 14 08:36:58 CEST 2014
commit eeda62a2b6cff58af1439dc068a88a59e9b0245b
Author: Witold Filipczyk <witekfl at poczta.onet.pl>
Date: Wed May 14 08:36:34 2014 +0200
- added two patches from git
- rel 0.2
deprecated.patch | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
dirs.patch | 37 ++++++++++++++++++++++++++++++++++++
libqtxdg.spec | 6 +++++-
3 files changed, 99 insertions(+), 1 deletion(-)
---
diff --git a/libqtxdg.spec b/libqtxdg.spec
index 6a1fdba..27c302c 100644
--- a/libqtxdg.spec
+++ b/libqtxdg.spec
@@ -3,11 +3,13 @@
Summary: libqtxdg
Name: libqtxdg
Version: 0.5.3
-Release: 0.1
+Release: 0.2
License: GPLv2 and LGPL-2.1+
Group: X11/Libraries
Source0: http://lxqt.org/downloads/libqtxdg/0.5.3/%{name}-%{version}.tar.xz
# Source0-md5: 1a1058d61600907e15bca991a60a70d7
+Patch0: dirs.patch
+Patch1: deprecated.patch
URL: http://www.lxqt.org/
BuildRequires: QtCore-devel >= %{qtver}
BuildRequires: QtGui-devel >= %{qtver}
@@ -40,6 +42,8 @@ pisaniu własnych programów wykorzystujących libqtxdg.
%prep
%setup -q -c %{name}-%{version}
+%patch0 -p1
+%patch1 -p1
%build
install -d build
diff --git a/deprecated.patch b/deprecated.patch
new file mode 100644
index 0000000..e4e33c2
--- /dev/null
+++ b/deprecated.patch
@@ -0,0 +1,57 @@
+commit bf8e805ebe20bc0ee4048db60cd68784a6c7dffc
+Author: Luís Pereira <luis.artur.pereira at gmail.com>
+Date: Thu May 8 16:23:14 2014 -0700
+
+ Adds QTXDG_DEPRECATED macro
+
+ Signed-off-by: Luís Pereira <luis.artur.pereira at gmail.com>
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3b2bae6..e7e7793 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -82,6 +82,7 @@ set(libqtxdg_PUBLIC_H_FILES
+ xdgmime.h
+ xmlhelper.h
+ xdgautostart.h
++ xdgmacros.h
+ )
+
+ set(libqtxdg_PUBLIC_CLASSES
+diff --git a/xdgmacros.h b/xdgmacros.h
+new file mode 100644
+index 0000000..8ad12d2
+--- /dev/null
++++ b/xdgmacros.h
+@@ -0,0 +1,31 @@
++/*
++ * libqtxdg - An Qt implementation of freedesktop.org xdg specs
++ * Copyright (C) 2014 Luís Pereira <luis.artur.pereira at gmail.com>
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * This library 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
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301 USA
++ */
++
++#ifndef QTXDG_MACROS_H
++#define QTXDG_MACROS_H
++
++#ifdef __cplusplus
++# include <QtCore/qglobal.h>
++# ifndef QTXDG_DEPRECATED
++# define QTXDG_DEPRECATED Q_DECL_DEPRECATED
++# endif
++#endif
++
++#endif // QTXDG_MACROS_H
diff --git a/dirs.patch b/dirs.patch
new file mode 100644
index 0000000..c1a4386
--- /dev/null
+++ b/dirs.patch
@@ -0,0 +1,37 @@
+commit ef68d9acc1df9584f183f1434a5bebc53e565dc7
+Author: Hong Jen Yee (PCMan) <pcman.tw at gmail.com>
+Date: Thu May 8 23:53:49 2014 +0800
+
+ Set library dirs properly in qtxdg-config and use files.
+
+diff --git a/cmake/qtxdg-config.cmake.in b/cmake/qtxdg-config.cmake.in
+index edb408b..e8b481d 100644
+--- a/cmake/qtxdg-config.cmake.in
++++ b/cmake/qtxdg-config.cmake.in
+@@ -7,6 +7,8 @@
+ #
+ # QTXDG_INCLUDE_DIRS - The QtXdg include directory
+ #
++# QTXDG_LIBRARY_DIRS - The QtXdg library directory
++#
+ # QTXDG_LIBRARIES - The libraries needed to use QtXdg
+ #
+ # QTXDG_USE_FILE - The variable QTXDG_USE_FILE is set which is the path
+@@ -35,6 +37,8 @@ set(QTXDG_LIBRARY @QTXDGX_LIBRARY_NAME@)
+ set(QTXDG_LIBRARIES ${QTXDG_LIBRARY})
+ set(QTXDG_INCLUDE_DIRS ${QTXDG_INCLUDE_DIR})
+
++set(QTXDG_LIBRARY_DIRS @CMAKE_INSTALL_FULL_LIBDIR@)
++
+ set(QTXDG_USE_FILE ${CMAKE_CURRENT_LIST_DIR}/@QTXDGX_FILE_NAME at _use.cmake)
+ set(QTXDG_FOUND 1)
+
+diff --git a/cmake/qtxdg_use.cmake b/cmake/qtxdg_use.cmake
+index a5a3210..93c93a6 100644
+--- a/cmake/qtxdg_use.cmake
++++ b/cmake/qtxdg_use.cmake
+@@ -8,3 +8,4 @@ include(${QT_USE_FILE})
+ set(QTXDG_QT_LIBRARIES ${QT_LIBRARIES})
+
+ include_directories(${QTXDG_INCLUDE_DIRS})
++link_directories(${QTXDG_LIBRARY_DIRS})
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libqtxdg.git/commitdiff/eeda62a2b6cff58af1439dc068a88a59e9b0245b
More information about the pld-cvs-commit
mailing list