summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgregory guy <gregory-tde@laposte.net>2020-09-30 07:56:33 +0200
committergregory guy <gregory-tde@laposte.net>2020-09-30 07:56:33 +0200
commit07a6d98c1b4a852cfaca3ac02b388351909d7b9c (patch)
tree7ae753dd05ae4e8e8fcee9c3cd3501907ac0a982
parentb986718d988717c5321022729cdcc731820709d3 (diff)
downloadtde-style-lipstik-07a6d98c1b4a852cfaca3ac02b388351909d7b9c.tar.gz
tde-style-lipstik-07a6d98c1b4a852cfaca3ac02b388351909d7b9c.zip
Drop automake build support.
Add basic cmake build instructions. Deleted empty file NEWS. Deleted spec file (rpm) lipstik.spec. Rework of the README file. Some cosmetics. Signed-off-by: gregory guy <gregory-tde@laposte.net>
-rw-r--r--.gitmodules3
-rw-r--r--CMakeLists.txt4
-rw-r--r--INSTALL102
-rw-r--r--Makefile.am26
-rw-r--r--Makefile.dist14
-rw-r--r--NEWS1
-rw-r--r--README60
m---------admin0
-rw-r--r--configure.files2
-rw-r--r--configure.in.in4
-rw-r--r--lipstik.spec59
-rw-r--r--stamp-h.in0
-rw-r--r--style/Makefile.am25
-rw-r--r--style/config/Makefile.am12
-rw-r--r--subdirs1
15 files changed, 46 insertions, 267 deletions
diff --git a/.gitmodules b/.gitmodules
index bdec8fc..69dd7b2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "admin"]
- path = admin
- url = https://system@scm.trinitydesktop.org/scm/git/tde-common-admin
[submodule "cmake"]
path = cmake
url = https://system@scm.trinitydesktop.org/scm/git/tde-common-cmake
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 327cea1..381ed8b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,13 +41,13 @@ tde_setup_paths( )
##### optional stuff
-option( WITH_ALL_OPTIONS "Enable all optional support" OFF )
+option( WITH_ALL_OPTIONS "Enable all optional support" OFF )
option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )
##### user requested modules
-option( BUILD_ALL "Build all" ON )
+option( BUILD_ALL "Build all" ON )
option( BUILD_TRANSLATIONS "Build translations" ${BUILD_ALL} )
diff --git a/INSTALL b/INSTALL
index 728c232..23ba0cd 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,86 +1,16 @@
------ First of all:
-
-If possible, and available, try a package built specifically for your
-distribution...
-
-
------ Building from sources:
-
-First make sure that you have both the QT and KDE development headers
-installed. (qt and tdelibs devel)
-
-Then unpack the sources somewhere you have writing rights.
-
-In a terminal (konsole, xterm, eterm, etc.), type :
-
- ./configure
-
- make
-
- (Then, as root):
- make install
-
---
-
-If any of these steps fail, do:
-
- make -f Makefile.dist
-
-It may help you build it. If it still fails, mail me.
-
-
------ Bad configure = build failure...
-
-You might need to give 'configure' the path to your kde
-installation. eg: /usr, /opt/kde.
-
- ./configure --prefix=/opt/kde
-
---
-
-You can find your KDE base directory by typing tde-config --prefix
-
---
-
--------------------------------------------------------------------------------
-
------ Debian notes:
-
-You may need to append this to the configure line:
- --prefix=/usr
-
-And maybe this one:
- --with-qt-includes=/usr/include/qt3
-
-
------ Mandrake/Mandriva notes:
-
-Mandrake 10.0 uses KDE 3.2. I never tested lipstik against KDE 3.2 but it "should" work with
-some tweaking (see Debian notes).
-I dont have Mandrake around so I cant give more specific help for now, stay tuned.
-
-Mandriva (Mandrake's new name) is using more recent KDE releases. Lipstik should work
-out of the box there.
-
-
------ moc troubles???
-
-Some people have reported that building fails with errors related to .moc files.
- eg:
- lipstikconf.cpp:479:27: lipstikconf.moc: No such file or directory
-
-If this happens to you, dont panic.
-In the source dir, there are style and style/config subdirs:
-
- In the style dir do:
- moc -o lipstik.moc lipstik.h
-
- And then in the style/config subdir do
- moc -o lipstikconf.moc lipstikconf.h
-
-Then run make again, it should work.
-
-
------ Lipstik's build system sucks...
-
-It should suck less now... maybe...
+Basic Installation
+==================
+
+tde-style-lipstik relies on cmake to build.
+
+Here are suggested default options:
+
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index 9b2cd40..0000000
--- a/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-SUBDIRS = style
-
-EXTRA_DIST = admin AUTHORS COPYING ChangeLog INSTALL README TODO lipstik.spec
-
-# not a GNU package. You can remove this line, if
-# have all needed files, that a GNU package needs
-AUTOMAKE_OPTIONS = foreign
-
-$(top_srcdir)/configure.in: configure.in.in $(top_srcdir)/subdirs
- cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.in ;
-
-$(top_srcdir)/subdirs:
- cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common subdirs
-
-$(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in
- @cd $(top_srcdir) && cat admin/acinclude.m4.in admin/libtool.m4.in > acinclude.m4
-
-MAINTAINERCLEANFILES = subdirs configure.in acinclude.m4 configure.files
-
-package-messages:
- $(MAKE) -f admin/Makefile.common package-messages
- $(MAKE) -C po merge
-
-dist-hook:
- cd $(top_distdir) && perl admin/am_edit -padmin
- cd $(top_distdir) && $(MAKE) -f admin/Makefile.common subdirs
diff --git a/Makefile.dist b/Makefile.dist
deleted file mode 100644
index e12528e..0000000
--- a/Makefile.dist
+++ /dev/null
@@ -1,14 +0,0 @@
-
-all:
- @echo "This Makefile is only for the CVS repository"
- @echo ""
- @if test ! -d admin; then \
- echo "Please recheckout this module!" ;\
- echo "for cvs: use checkout once and after that update again" ;\
- echo "for cvsup: checkout kde-common from cvsup and" ;\
- echo " link kde-common/admin to ./admin" ;\
- exit 1 ;\
- fi
- $(MAKE) -f admin/Makefile.common cvs
-
-.SILENT:
diff --git a/NEWS b/NEWS
deleted file mode 100644
index 38a7ad0..0000000
--- a/NEWS
+++ /dev/null
@@ -1 +0,0 @@
-see ChangeLog
diff --git a/README b/README
index c9b4a8f..e85ff75 100644
--- a/README
+++ b/README
@@ -1,39 +1,35 @@
-#ABOUT
-This is Lipstik, a fast and clean KDE 3 style based on Plastik.
-
-It contains the following features :
-
- Two widget gradients styles (Lipstik and Plastik's original),
- A unique Menu Stripe style,
- Many options to configure the active menu highlighting,
- Configurable Sliders handles size,
- Configurable Scrollbar handles width,
- Different Toolbar handles for a less cluttered look,
- More Mouse Hover effects,
- Better focus rectangle,
- Highly configurable colors,
- Many options to configure the Scrollbar buttons disposition,
- No more status bar frames...
+
+ tde-style-lipstik - a "lipstik" style for TDE.
-...and many other enhancements!
-#CREDITS
-This is based on the work of Sandro Giessl <ceebx@users.sourceforge.net> and
-the author of kerastik from which I ripped the automake,configure,etc.
-Im not quite sure yet but the author of kerastik seems to be "intirruphay".
-Please "intirruphay" tell me more so I can credit you for your work.
+tde-style-lipstik is a fast and clean style based on Plastik to tune
+your desktop look.
+
+
+
+FEATURES:
+=========
+
+* Two widget gradients styles (Lipstik and Plastik's original)
+* A unique Menu Stripe style
+* Many options to configure the active menu highlighting
+* Configurable Sliders handles size
+* Configurable Scrollbar handles width
+* Different Toolbar handles for a less cluttered look
+* More Mouse Hover effects
+* Better focus rectangle
+* Highly configurable colors
+* Many options to configure the Scrollbar buttons disposition
+
-#WHY?
-Well, I first distributed this "hack" on kde-look.org as a replacement for plastik, but
-some people convinced me to release it as a fully separated package.
-#WHY??
-Plastik looks good, I just wanted something different for Christmas.
+CONTRIBUTING
+==============
-#NO, REALLY, WHY???
-I want peace in the world, and this is how Im gonna achieve this.
+If you wish to contribute to tde-style-lipstik, you might do so:
-#HOW DO I INSTALL THIS STYLE?
-PLEASE LOOK AT THE FILE CALLED "INSTALL" ...
+- TDE Gitea Workspace (TGW) collaboration tool.
+ https://mirror.git.trinitydesktop.org/gitea
-Have fun!
+- TDE Weblate Translation Workspace (TWTW) collaboration tool.
+ https://mirror.git.trinitydesktop.org/weblate
diff --git a/admin b/admin
deleted file mode 160000
-Subproject 80eb8bffc7c3b5cbf5ab51b4d7877d0cdaad45e
diff --git a/configure.files b/configure.files
deleted file mode 100644
index 030bce8..0000000
--- a/configure.files
+++ /dev/null
@@ -1,2 +0,0 @@
-./admin/configure.in.min
-configure.in.in
diff --git a/configure.in.in b/configure.in.in
deleted file mode 100644
index 313919a..0000000
--- a/configure.in.in
+++ /dev/null
@@ -1,4 +0,0 @@
-#MIN_CONFIG(3)
-
-KDE_ENABLE_HIDDEN_VISIBILITY
-AM_INIT_AUTOMAKE(lipstik, 0.1)
diff --git a/lipstik.spec b/lipstik.spec
deleted file mode 100644
index 02ea7e2..0000000
--- a/lipstik.spec
+++ /dev/null
@@ -1,59 +0,0 @@
-Summary: lipstik theme for KDE
-Name: lipstik
-Version: 2.2.3
-Release: 1
-Source: %{name}-%{version}.tar.bz2
-URL: http://www.kde-look.org/content/show.php?content=18223
-Vendor: poplixos (at) gmail.com
-License: GPL
-Group: System/GUI/KDE
-Packager: William Flynn <wdf@sifr.net>
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: tdelibs >= 3.0
-Requires: tdelibs >= 3.0
-
-%description
-Lipstik is a fast and clean style with many options to tune your desktop look.
-
-%prep
-%setup -q
-
-%build
-./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-make
-
-%install
-make install prefix=$RPM_BUILD_ROOT/usr
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(0644, root, root)
-/usr/lib/trinity/tdestyle_lipstik_config.la
-/usr/lib/trinity/tdestyle_lipstik_config.so
-/usr/lib/trinity/plugins/styles/lipstik.la
-/usr/lib/trinity/plugins/styles/lipstik.so
-/usr/share/apps/tdestyle/themes/lipstik.themerc
-/usr/share/apps/tdedisplay/color-schemes/lipstikstandard.kcsrc
-/usr/share/apps/tdedisplay/color-schemes/lipstikwhite.kcsrc
-/usr/share/apps/tdedisplay/color-schemes/lipstiknoble.kcsrc
-
-%changelog
-* Mon Oct 01 2007 Patrice Tremblay
-Version 2.2.3, for my PC-BSD friends... :
-- Add a configurable active tab highlight color.
-
-* Sat Feb 17 2007 Patrice Tremblay
-Version 2.2.2, based on the special release for Debian, 2.2.1, which
-was never announced:
-- A tweak in the build system.
-- An updated spec file thanks Pramod Venugopal
-- Toolbar gradients are now off by default.
-
-* Wed Jan 31 2007 Pramod Venugopal
-Updated Spec file for FC6 with the following:
-- Changed dependencies to reflect FC6 packages
-- Changed prefix in configure script to point to default locations
-- Changed prefix in install to lowercase and to point to usr
-- Changed files to reflect new locations
diff --git a/stamp-h.in b/stamp-h.in
deleted file mode 100644
index e69de29..0000000
--- a/stamp-h.in
+++ /dev/null
diff --git a/style/Makefile.am b/style/Makefile.am
deleted file mode 100644
index 7017f74..0000000
--- a/style/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-AUTOMAKE_OPTIONS = foreign
-
-SUBDIRS = config
-
-KDE_CXXFLAGS = -DQT_PLUGIN
-
-INCLUDES = $(all_includes)
-
-stylercdir = $(kde_datadir)/tdestyle/themes
-stylerc_DATA = lipstik.themerc
-
-colorshemedir = $(kde_datadir)/tdedisplay/color-schemes
-colorsheme_DATA = lipstikstandard.kcsrc lipstikwhite.kcsrc lipstiknoble.kcsrc
-
-EXTRA_DIST = $(stylerc_DATA)
-
-noinst_HEADERS = lipstik.h misc.h
-
-kde_style_LTLIBRARIES = lipstik.la
-lipstik_la_SOURCES = lipstik.cpp misc.cpp
-lipstik_la_LDFLAGS = $(all_libraries) $(LIB_TQT) $(KDE_PLUGIN) -module
-lipstik_la_LIBADD = -ltdefx
-lipstik_la_METASOURCES = AUTO
-
-DISTCLEANFILES = $(lipstik_la_METASOURCES)
diff --git a/style/config/Makefile.am b/style/config/Makefile.am
deleted file mode 100644
index 4e20807..0000000
--- a/style/config/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-INCLUDES = $(all_includes)
-
-noinst_HEADERS = lipstikconf.h
-kde_module_LTLIBRARIES = tdestyle_lipstik_config.la
-tdestyle_lipstik_config_la_LDFLAGS = $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(KDE_PLUGIN) -module
-tdestyle_lipstik_config_la_LIBADD = $(LIB_TDEUI)
-tdestyle_lipstik_config_la_SOURCES = lipstikconf.cpp
-tdestyle_lipstik_config_la_METASOURCES = AUTO
-
-
-messages:
- $(XGETTEXT) *.cpp *.h -o $(podir)/tdestyle_lipstik_config.pot
diff --git a/subdirs b/subdirs
deleted file mode 100644
index 8cd8941..0000000
--- a/subdirs
+++ /dev/null
@@ -1 +0,0 @@
-style