Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 468680 - x11-themes/fvwm-crystal-3.2.3: version bump
Summary: x11-themes/fvwm-crystal-3.2.3: version bump
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: [OLD] Library (show other bugs)
Hardware: All Linux
: Normal enhancement (vote)
Assignee: Proxy Maintainers
URL:
Whiteboard:
Keywords: EBUILD, InVCS
Depends on:
Blocks: 464364
  Show dependency tree
 
Reported: 2013-05-05 16:57 UTC by Dominique Michel
Modified: 2013-06-23 10:06 UTC (History)
0 users

See Also:
Package list:
Runtime testing required: ---


Attachments
ebuild for FVWM-Crystal-3.1.12 (fvwm-crystal-3.1.12.ebuild,1.70 KB, text/plain)
2013-05-05 18:54 UTC, Dominique Michel
Details
Makefile patch (fvwm-crystal-build.patch,813 bytes, patch)
2013-05-05 18:56 UTC, Dominique Michel
Details | Diff
diff for fvwm-crystal-3.1.12.ebuild (fvwm-crystal.3.1.12.diff,3.38 KB, patch)
2013-05-07 10:48 UTC, Dominique Michel
Details | Diff
fvwm-crystal-3.1.12.ebuild (fvwm-crystal-3.1.12.ebuild,1.80 KB, text/plain)
2013-05-17 20:50 UTC, Sergey Popov
Details
build patch for 3.2.0 (fvwm-crystal-3.2.0-build.patch,488 bytes, patch)
2013-05-27 13:19 UTC, Dominique Michel
Details | Diff
ebuild for fvwm-crystal-3.2.3 (fvwm-crystal-3.2.3.ebuild,1.73 KB, text/plain)
2013-06-23 09:56 UTC, Dominique Michel
Details

Note You need to log in before you can comment on or make changes to this bug.
Description Dominique Michel 2013-05-05 16:57:48 UTC
I made 2 new releases of Fvwm-Crystal in a short time.

3.1.7 was a major update and bug fixes. It should fix bug4643.
The changes was great and this introduced new bugs. They are fixed in 3.1.12 and new features was added as well.

The dependencies have changed a little. I will post an ebuild later.

Reproducible: Always
Comment 1 Dominique Michel 2013-05-05 16:59:39 UTC
The last numbers was hidden: bug464364
Comment 2 Dominique Michel 2013-05-05 18:54:41 UTC
Created attachment 347448 [details]
ebuild for FVWM-Crystal-3.1.12
Comment 3 Dominique Michel 2013-05-05 18:56:26 UTC
Created attachment 347450 [details, diff]
Makefile patch

This patch is still needed but it is smaller.
Comment 4 Jeroen Roovers (RETIRED) gentoo-dev 2013-05-06 08:00:25 UTC
Comment on attachment 347448 [details]
ebuild for FVWM-Crystal-3.1.12

--- fvwm-crystal-3.0.6-r2.ebuild        2012-08-01 02:49:20.000000000 +0200
+++ -   2013-05-06 10:00:04.617946667 +0200
@@ -1,38 +1,33 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-crystal/fvwm-crystal-3.0.6-r2.ebuild,v 1.4 2012/07/29 17:48:29 armin76 Exp $
+# $Header: $

-EAPI=4
+EAPI="5"

-PYTHON_DEPEND="2:2.7"
+PYTHON_COMPAT=( python2_7 )
+inherit eutils python-r1

-inherit eutils python
-
-DESCRIPTION="Configurable and full featured theme for FVWM, with lots of transparency"
-HOMEPAGE="http://gna.org/projects/fvwm-crystal/"
-SRC_URI="http://download.gna.org/${PN}/${PV}/${P}.tar.gz"
+DESCRIPTION="Configurable and full featured FVWM theme, with lots of transparency and freedesktop compatible menu"
+HOMEPAGE="http://fvwm-crystal.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""

-RDEPEND="|| ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[imagemagick,png] )
-       x11-apps/xwd
-       || ( x11-misc/habak x11-misc/hsetroot )
-       || ( x11-misc/stalonetray x11-misc/trayer )
-       >=x11-wm/fvwm-2.6.2[png]"
-
-pkg_setup() {
-       python_set_active_version 2
-       python_pkg_setup
-}
+RDEPEND="${PYTHON_DEPS}
+       >=x11-wm/fvwm-2.6.5[png]
+       || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
+       || ( >=x11-misc/stalonetray-0.6.2-r2 x11-misc/trayer )
+       || ( x11-misc/hsetroot media-gfx/feh )
+       sys-apps/sed
+       sys-devel/bc
+       virtual/awk
+       x11-apps/xwd"
 
 src_prepare() {
-       find . -type d -name '.svn' -prune -exec rm -rf {} ';' || die
-       python_convert_shebangs -r 2 bin fvwm/scripts #317041
        epatch \
-               "${FILESDIR}"/${PN}.apps.patch \
                "${FILESDIR}"/${PN}-build.patch
 }

@@ -43,22 +38,24 @@
                docdir="/usr/share/doc/${PF}" \
                prefix="/usr" \
                install
-
-       exeinto /etc/X11/Sessions
-       doexe "${FILESDIR}"/fvwm-crystal
-
-       insinto /usr/share/xsessions
-       doins addons/fvwm-crystal.desktop
 }
 
 pkg_postinst() {
        einfo
-       einfo "Configuration examples can be found in ${ROOT}usr/share/doc/${PF}/examples/"
+       einfo "After installation, execute following commands:"
+       einfo " $ cp -r /usr/share/doc/${PF}/addons/Xresources ~/.Xresources"
+       einfo " $ cp -r /usr/share/doc/${PF}/addons/Xsession ~/.xinitrc"
        einfo
        einfo "Many applications can extend functionality of fvwm-crystal."
-       einfo "They are listed in the INSTALL file in ${ROOT}usr/share/doc/${PF}."
+       einfo "They are listed in /usr/share/doc/${PF}/INSTALL.gz."
+       einfo
+       einfo "Some icons fixes was committed recently."
+       einfo "To archive the same fixes on your private icon files,"
+       einfo "please read /usr/share/doc/${PF}/INSTALL.gz."
+       einfo "This will fix the libpng warnings at stderr."
        einfo
-       ewarn "In this release, all hyphens (-) in names of env variables"
-       ewarn "used by FVWM-Crystal have been replaced by underscores (_)."
-       ewarn "You may need to update your configuration."
+       einfo "The color themes was updated to Fvwm InfoStore."
+       einfo "To know how to update your custom color themes, please read"
+       einfo " /usr/share/doc/${PF}/addons/convert_colorsets.gz"
+       einfo ""
 }
Comment 5 Dominique Michel 2013-05-06 10:20:10 UTC
It is a minor issue I can see with the addons directory. Most of the files here are scripts or resources files. 

By default, they get installed into $(prefix)/share/fvwm-crystal/addons.

On gentoo, they get installed into $(prefix)/share/doc/${PF}/addons and get compressed.

Only one of the files in addons is documentation, the other files are scripts or resources files. They are mean to be used by the user, fvwm-crystal will not use them directly.

The advantage with $(prefix)/share/doc/${PF}/addons is the user will find them even if he doesn't read the einfo, but it will have to de-compress them in order to use them. I don't know which path better for those files, or if it is a gentoo policy for such files..
Comment 6 Dominique Michel 2013-05-06 11:01:00 UTC
I am also not sure if x11-themes is the correct category. Some distributions are using a similar category, other are using a desktop category like x11-wm.

As fact, fvwm-crystal is more than just an advanced fvwm theme, it provide features like automatic creation of the application menu with support of the freedesktop categories (long before the rewrite of fvwm-menu-desktop, which is not used by Crystal, it is why it have a python depend) including the additional categories.

Crystal have several ways to manage the icons on the desktop, if the user choose Thunar, Fvwm-Crystal will manage itself the icons on the desktop, and Thunar will only be launched when clicking one of those icons. In some future release, I will maybe add a preference for the file manager to use.

Last but not least, Fvwm-Crystal is able to provide not only a typical X feature like multiple desktop pages, but also and at the same time, a navigation system similar to the applications stack of the Amiga OS. In short, the user can put in full screen almost any application, and easily navigate between those full-screened applications and the desktop (on the current desktop page, I try global, but it was messy, it is simpler and better to use X bindings Alt+F<n> for that). One of the goals for 3.1.7 was to make this function to work well, and with 3.1.12 most of its bugs was fixed.

For what I know, no other linux desktop provide that functionality. This is another and innovative (on X) way to navigate through desktop space, and when you are used to it, you feel this is a must have desktop feature.
Comment 7 Dominique Michel 2013-05-07 10:48:00 UTC
Created attachment 347592 [details, diff]
diff for fvwm-crystal-3.1.12.ebuild

A new version of the ebuild. It introduce EPREFIX in the install phase and install the addons directory in ${EPREFIX}/usr/share/fvwm-crystal.
Comment 8 Sergey Popov gentoo-dev 2013-05-17 20:50:22 UTC
Created attachment 348562 [details]
fvwm-crystal-3.1.12.ebuild

Updated ebuild for fvwm-crystal
Comment 9 Dominique Michel 2013-05-27 13:19:36 UTC
Created attachment 349344 [details, diff]
build patch for 3.2.0

3.2.0 is out. This patch remove the COPYING file from the installation.
The echo in make install is included upstream.
Comment 10 Dominique Michel 2013-06-16 11:20:38 UTC
3.2.1 is out. It is mainly a bug fixes releases which address several installation related issues. However and fortunately, most of these issues doesn't concern portage. The same ebuild work fine.

It is also a few new functions, like the preferences that work without restart, and a few new key bindings.
Comment 11 Pacho Ramos gentoo-dev 2013-06-16 12:23:39 UTC
Are you willing to proxy-maintain this?
http://www.gentoo.org/proj/en/qa/proxy-maintainers/
Comment 12 Dominique Michel 2013-06-21 13:06:33 UTC
(In reply to Pacho Ramos from comment #11)
> Are you willing to proxy-maintain this?
> http://www.gentoo.org/proj/en/qa/proxy-maintainers/

Sorry for the delay, I was buzzy with a lot of other things.

For your question, sure I can do it.

Regarding the ebuild, I don't understand why "python_replicate_script" is needed when the execs contain shebangs that point to the correct python version.
Comment 13 Pacho Ramos gentoo-dev 2013-06-21 13:23:10 UTC
Will reassign to proxy-maint people then
Comment 14 Dominique Michel 2013-06-21 14:04:00 UTC
(In reply to Dominique Michel from comment #12)
> Regarding the ebuild, I don't understand why "python_replicate_script" is
> needed when the execs contain shebangs that point to the correct python
> version.

In Fvwm-Crystal-3.2.2, the shebangs are changed from #!/usr/bin/env python2 to #!/usr/bin/env python2.7. The python_replicate_script line fail with

* A file does not seem to have a supported shebang:
 *   file: /var/tmp/portage/x11-themes/fvwm-crystal-9999/image//usr/bin/fvwm-crystal.apps-python2.7
 *   shebang: #!/usr/bin/env python2.7

What is best, to revert that change in the source code, or to remove python_replicate_script in the ebuild?
Comment 15 Markos Chandras (RETIRED) gentoo-dev 2013-06-22 18:35:06 UTC
Dominique,

version 3.2.2 released a couple of days ago. Can we please get an updated ebuild for that ? ( I assume the build patch is not needed anymore ).
Comment 16 Dominique Michel 2013-06-23 09:56:11 UTC
Created attachment 351726 [details]
ebuild for fvwm-crystal-3.2.3

3.2.3 is out. After looking at other packages, and as they don't install the Copying file, I changed it into the source. So, the build patch is not needed any more.

I also reverted the python shebang to the same value than before (python2).
Comment 17 Markos Chandras (RETIRED) gentoo-dev 2013-06-23 10:06:22 UTC
This needs fixing in the future:

   x11-themes/fvwm-crystal/fvwm-crystal-3.0.6-r2.ebuild: please migrate from 'python' to 'python-r1 / python-single-r1 / python-any-r1' on line: 9

Committed. Thank you very much

+*fvwm-crystal-3.2.3 (23 Jun 2013)
+
+  23 Jun 2013; Markos Chandras <hwoarang@gentoo.org> +fvwm-crystal-3.2.3.ebuild,
+  metadata.xml:
+  Version bump. Bug #468680. Ebuild by Dominique Michel
+  <dominique.michel@vtxnet.ch> who will maintain it from now on
+


http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/x11-themes/fvwm-crystal/fvwm-crystal-3.2.3.ebuild?revision=1.1&view=markup

http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/x11-themes/fvwm-crystal/metadata.xml?r1=1.5&r2=1.6