public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/qt:master commit in: x11-misc/lightdm-razorqt-greeter/files/, x11-misc/lightdm-razorqt-greeter/
@ 2012-10-20  7:16 Ben de Groot
  0 siblings, 0 replies; 2+ messages in thread
From: Ben de Groot @ 2012-10-20  7:16 UTC (permalink / raw
  To: gentoo-commits

commit:     6a67bb72b907cb97a82e2c6fab5f7cf2a7796708
Author:     Ben de Groot <yngwin <AT> gmail <DOT> com>
AuthorDate: Sat Oct 20 07:16:03 2012 +0000
Commit:     Ben de Groot <yngwin <AT> gentoo <DOT> org>
CommitDate: Sat Oct 20 07:16:03 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=6a67bb72

x11-misc/lightdm-razorqt-greeter: move to razorqt-base/razorqt-lightdm-greeter

---
 .../files/Build-against-0.4.1.patch                |   50 --------------------
 .../files/Build-only-greeter.patch                 |   43 -----------------
 .../lightdm-razorqt-greeter-9999.ebuild            |   35 --------------
 3 files changed, 0 insertions(+), 128 deletions(-)

diff --git a/x11-misc/lightdm-razorqt-greeter/files/Build-against-0.4.1.patch b/x11-misc/lightdm-razorqt-greeter/files/Build-against-0.4.1.patch
deleted file mode 100644
index 307dde3..0000000
--- a/x11-misc/lightdm-razorqt-greeter/files/Build-against-0.4.1.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From c524f4aded68e9e70bf08e8b4e829dab9df517f9 Mon Sep 17 00:00:00 2001
-From: Alec Moskvin <alecm@gmx.com>
-Date: Tue, 8 May 2012 13:06:24 -0400
-Subject: [PATCH 2/2] Build against 0.4.1
-
----
- razorqt-lightdm-greeter/CMakeLists.txt |    6 ++++--
- razorqt-lightdm-greeter/loginform.cpp  |    2 +-
- 2 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git razorqt-lightdm-greeter/CMakeLists.txt razorqt-lightdm-greeter/CMakeLists.txt
-index 9db9ff3..b5f4ee2 100644
---- razorqt-lightdm-greeter/CMakeLists.txt
-+++ razorqt-lightdm-greeter/CMakeLists.txt
-@@ -52,8 +52,6 @@ else()
-     include_directories (
-             ${CMAKE_CURRENT_SOURCE_DIR}
-             ${CMAKE_CURRENT_BINARY_DIR}
--            ${CMAKE_SOURCE_DIR}/libraries/
--            ${CMAKE_SOURCE_DIR}/libraries/razorqt
-             ${LIGHTDM_QT_INCLUDE_DIRS}
-             )
- 
-@@ -91,6 +89,10 @@ else()
- 
-     install(TARGETS ${PROJECT} RUNTIME DESTINATION bin)
-     install(FILES   ${DESKTOP_FILES}   DESTINATION /usr/share/xgreeters)
-+
-+    install(FILES ../razorqt-resources/graphics/rqt-2.svg DESTINATION share/razor/graphics/)
-+    install(DIRECTORY ../razorqt-resources/themes/light/razor-lightdm-greeter
-+        DESTINATION share/razor/themes/light/)
- endif()
- 
- endif (ENABLE_LIGHTDM_GREETER)
-diff --git razorqt-lightdm-greeter/loginform.cpp razorqt-lightdm-greeter/loginform.cpp
-index 8cffe90..79438a7 100644
---- razorqt-lightdm-greeter/loginform.cpp
-+++ razorqt-lightdm-greeter/loginform.cpp
-@@ -51,7 +51,7 @@ LoginForm::LoginForm(QWidget *parent) : QWidget(parent), ui(new Ui::LoginForm)
-     }
- 
-     ui->setupUi(this);
--    setStyleSheet(razorTheme.qss("razor-lightdm-greeter/razor-lightdm-greeter"));
-+    setStyleSheet(razorTheme->qss("razor-lightdm-greeter/razor-lightdm-greeter"));
-     ui->hostnameLabel->setFocus();
- 
-     // Setup users
--- 
-1.7.8.6
-

diff --git a/x11-misc/lightdm-razorqt-greeter/files/Build-only-greeter.patch b/x11-misc/lightdm-razorqt-greeter/files/Build-only-greeter.patch
deleted file mode 100644
index a913928..0000000
--- a/x11-misc/lightdm-razorqt-greeter/files/Build-only-greeter.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 5a27d6739eefea1a9f32a75113cb66e5e35a4f4b Mon Sep 17 00:00:00 2001
-From: Alec Moskvin <alecm@gmx.com>
-Date: Tue, 8 May 2012 12:08:04 -0400
-Subject: [PATCH] Build only greeter
-
----
- CMakeLists.txt |   15 +--------------
- 1 files changed, 1 insertions(+), 14 deletions(-)
-
-diff --git CMakeLists.txt CMakeLists.txt
-index faa7166..ebc6030 100644
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -52,20 +52,7 @@ message(STATUS "")
- 
- 
- # main build subdirs
--add_subdirectory( libraries )
--add_subdirectory( razorqt-session )
--add_subdirectory( razorqt-panel )
--add_subdirectory( razorqt-desktop )
--add_subdirectory( razorqt-appswitcher )
--add_subdirectory( razorqt-resources )
--#add_subdirectory( razorqt-su )
--add_subdirectory( razorqt-x11info )
--add_subdirectory( razorqt-runner )
--add_subdirectory( razorqt-config )
--add_subdirectory( razorqt-power )
--add_subdirectory( razorqt-policykit )
- add_subdirectory( razorqt-lightdm-greeter )
--add_subdirectory( razorqt-notify )
- 
- ########### Add uninstall target ###############
- CONFIGURE_FILE(
-@@ -88,4 +75,4 @@ INCLUDE(CPack)
- # simulate autotools' "make dist"
- add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
- 
--add_subdirectory( doxygen )
-+#add_subdirectory( doxygen )
--- 
-1.7.8.6
-

diff --git a/x11-misc/lightdm-razorqt-greeter/lightdm-razorqt-greeter-9999.ebuild b/x11-misc/lightdm-razorqt-greeter/lightdm-razorqt-greeter-9999.ebuild
deleted file mode 100644
index 79d8ce8..0000000
--- a/x11-misc/lightdm-razorqt-greeter/lightdm-razorqt-greeter-9999.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit cmake-utils
-
-DESCRIPTION="LightDM greeter for Razor-qt"
-HOMEPAGE="http://razor-qt.org"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-2
-	EGIT_REPO_URI="git://github.com/Razor-qt/razor-qt.git"
-	EGIT_BRANCH="master"
-	KEYWORDS=""
-else
-	SRC_URI=""
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="x11-libs/qt-core:4
-	x11-libs/qt-gui:4
-	x11-misc/lightdm[qt4]
-	=x11-wm/razorqt-0.4.1*"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/Build-against-0.4.1.patch"
-	"${FILESDIR}/Build-only-greeter.patch"
-)


^ permalink raw reply related	[flat|nested] 2+ messages in thread
* [gentoo-commits] proj/qt:master commit in: x11-misc/lightdm-razorqt-greeter/files/, x11-misc/lightdm-razorqt-greeter/
@ 2012-05-27  6:58 Ben de Groot
  0 siblings, 0 replies; 2+ messages in thread
From: Ben de Groot @ 2012-05-27  6:58 UTC (permalink / raw
  To: gentoo-commits

commit:     28751b3feca05d83d5d3849c7bad278b5c4faff5
Author:     Ben de Groot <yngwin <AT> gmail <DOT> com>
AuthorDate: Sun May 27 06:58:29 2012 +0000
Commit:     Ben de Groot <yngwin <AT> gmail <DOT> com>
CommitDate: Sun May 27 06:58:29 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=28751b3f

x11-misc/lightdm-razorqt-greeter: initial commit, based on ebuild and patches provided by upstream

---
 .../files/Build-against-0.4.1.patch                |   50 ++++++++++++++++++++
 .../files/Build-only-greeter.patch                 |   43 +++++++++++++++++
 .../lightdm-razorqt-greeter-9999.ebuild            |   35 ++++++++++++++
 3 files changed, 128 insertions(+), 0 deletions(-)

diff --git a/x11-misc/lightdm-razorqt-greeter/files/Build-against-0.4.1.patch b/x11-misc/lightdm-razorqt-greeter/files/Build-against-0.4.1.patch
new file mode 100644
index 0000000..307dde3
--- /dev/null
+++ b/x11-misc/lightdm-razorqt-greeter/files/Build-against-0.4.1.patch
@@ -0,0 +1,50 @@
+From c524f4aded68e9e70bf08e8b4e829dab9df517f9 Mon Sep 17 00:00:00 2001
+From: Alec Moskvin <alecm@gmx.com>
+Date: Tue, 8 May 2012 13:06:24 -0400
+Subject: [PATCH 2/2] Build against 0.4.1
+
+---
+ razorqt-lightdm-greeter/CMakeLists.txt |    6 ++++--
+ razorqt-lightdm-greeter/loginform.cpp  |    2 +-
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git razorqt-lightdm-greeter/CMakeLists.txt razorqt-lightdm-greeter/CMakeLists.txt
+index 9db9ff3..b5f4ee2 100644
+--- razorqt-lightdm-greeter/CMakeLists.txt
++++ razorqt-lightdm-greeter/CMakeLists.txt
+@@ -52,8 +52,6 @@ else()
+     include_directories (
+             ${CMAKE_CURRENT_SOURCE_DIR}
+             ${CMAKE_CURRENT_BINARY_DIR}
+-            ${CMAKE_SOURCE_DIR}/libraries/
+-            ${CMAKE_SOURCE_DIR}/libraries/razorqt
+             ${LIGHTDM_QT_INCLUDE_DIRS}
+             )
+ 
+@@ -91,6 +89,10 @@ else()
+ 
+     install(TARGETS ${PROJECT} RUNTIME DESTINATION bin)
+     install(FILES   ${DESKTOP_FILES}   DESTINATION /usr/share/xgreeters)
++
++    install(FILES ../razorqt-resources/graphics/rqt-2.svg DESTINATION share/razor/graphics/)
++    install(DIRECTORY ../razorqt-resources/themes/light/razor-lightdm-greeter
++        DESTINATION share/razor/themes/light/)
+ endif()
+ 
+ endif (ENABLE_LIGHTDM_GREETER)
+diff --git razorqt-lightdm-greeter/loginform.cpp razorqt-lightdm-greeter/loginform.cpp
+index 8cffe90..79438a7 100644
+--- razorqt-lightdm-greeter/loginform.cpp
++++ razorqt-lightdm-greeter/loginform.cpp
+@@ -51,7 +51,7 @@ LoginForm::LoginForm(QWidget *parent) : QWidget(parent), ui(new Ui::LoginForm)
+     }
+ 
+     ui->setupUi(this);
+-    setStyleSheet(razorTheme.qss("razor-lightdm-greeter/razor-lightdm-greeter"));
++    setStyleSheet(razorTheme->qss("razor-lightdm-greeter/razor-lightdm-greeter"));
+     ui->hostnameLabel->setFocus();
+ 
+     // Setup users
+-- 
+1.7.8.6
+

diff --git a/x11-misc/lightdm-razorqt-greeter/files/Build-only-greeter.patch b/x11-misc/lightdm-razorqt-greeter/files/Build-only-greeter.patch
new file mode 100644
index 0000000..a913928
--- /dev/null
+++ b/x11-misc/lightdm-razorqt-greeter/files/Build-only-greeter.patch
@@ -0,0 +1,43 @@
+From 5a27d6739eefea1a9f32a75113cb66e5e35a4f4b Mon Sep 17 00:00:00 2001
+From: Alec Moskvin <alecm@gmx.com>
+Date: Tue, 8 May 2012 12:08:04 -0400
+Subject: [PATCH] Build only greeter
+
+---
+ CMakeLists.txt |   15 +--------------
+ 1 files changed, 1 insertions(+), 14 deletions(-)
+
+diff --git CMakeLists.txt CMakeLists.txt
+index faa7166..ebc6030 100644
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -52,20 +52,7 @@ message(STATUS "")
+ 
+ 
+ # main build subdirs
+-add_subdirectory( libraries )
+-add_subdirectory( razorqt-session )
+-add_subdirectory( razorqt-panel )
+-add_subdirectory( razorqt-desktop )
+-add_subdirectory( razorqt-appswitcher )
+-add_subdirectory( razorqt-resources )
+-#add_subdirectory( razorqt-su )
+-add_subdirectory( razorqt-x11info )
+-add_subdirectory( razorqt-runner )
+-add_subdirectory( razorqt-config )
+-add_subdirectory( razorqt-power )
+-add_subdirectory( razorqt-policykit )
+ add_subdirectory( razorqt-lightdm-greeter )
+-add_subdirectory( razorqt-notify )
+ 
+ ########### Add uninstall target ###############
+ CONFIGURE_FILE(
+@@ -88,4 +75,4 @@ INCLUDE(CPack)
+ # simulate autotools' "make dist"
+ add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
+ 
+-add_subdirectory( doxygen )
++#add_subdirectory( doxygen )
+-- 
+1.7.8.6
+

diff --git a/x11-misc/lightdm-razorqt-greeter/lightdm-razorqt-greeter-9999.ebuild b/x11-misc/lightdm-razorqt-greeter/lightdm-razorqt-greeter-9999.ebuild
new file mode 100644
index 0000000..79d8ce8
--- /dev/null
+++ b/x11-misc/lightdm-razorqt-greeter/lightdm-razorqt-greeter-9999.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit cmake-utils
+
+DESCRIPTION="LightDM greeter for Razor-qt"
+HOMEPAGE="http://razor-qt.org"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-2
+	EGIT_REPO_URI="git://github.com/Razor-qt/razor-qt.git"
+	EGIT_BRANCH="master"
+	KEYWORDS=""
+else
+	SRC_URI=""
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="x11-libs/qt-core:4
+	x11-libs/qt-gui:4
+	x11-misc/lightdm[qt4]
+	=x11-wm/razorqt-0.4.1*"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/Build-against-0.4.1.patch"
+	"${FILESDIR}/Build-only-greeter.patch"
+)



^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-10-20  7:16 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-20  7:16 [gentoo-commits] proj/qt:master commit in: x11-misc/lightdm-razorqt-greeter/files/, x11-misc/lightdm-razorqt-greeter/ Ben de Groot
  -- strict thread matches above, loose matches on Subject: below --
2012-05-27  6:58 Ben de Groot

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox