Gentoo Forums
Gentoo Forums
Gentoo Forums
Quick Search: in
[Ebuild] FVWM CVS
View unanswered posts
View posts from last 24 hours

Goto page Previous  1, 2, 3, 4, 5, 6, 7, 8  Next  
Reply to topic    Gentoo Forums Forum Index Unsupported Software
View previous topic :: View next topic  
Author Message
swimmer
Veteran
Veteran


Joined: 15 Jul 2002
Posts: 1291
Location: Netherlands

PostPosted: Sun Aug 12, 2007 10:59 pm    Post subject: Reply with quote

Thank you - this makes things easier ;-)

Saludos
swimmer
Back to top
View user's profile Send private message
Zagloj
Guru
Guru


Joined: 17 Jun 2005
Posts: 314

PostPosted: Mon Aug 13, 2007 4:01 pm    Post subject: Reply with quote

Thanks a lot :P

Bye ;)
_________________
Your ideology seems to be: "I hate the fanatics, we shoud kill them all" juantxorena dixit.
Back to top
View user's profile Send private message
i92guboj
Moderator
Moderator


Joined: 30 Nov 2004
Posts: 10089
Location: Córdoba (Spain)

PostPosted: Sun Aug 19, 2007 4:02 pm    Post subject: Reply with quote

I just uploaded r16 to the live-ebuilds svn repository. A new patch from Thomas Adam was added:

http://fvwm.lair.be/viewtopic.php?f=40&t=1861&p=10437#p10437

It adds the capability to start the applications shaded. Like this:

Code:

Style <whatever> StartShaded

_________________
Gentoo Handbook | My website
Back to top
View user's profile Send private message
bMd
Tux's lil' helper
Tux's lil' helper


Joined: 07 Jul 2004
Posts: 110

PostPosted: Tue Aug 21, 2007 2:39 am    Post subject: Reply with quote

i92guboj wrote:
I just uploaded r16 to the live-ebuilds svn repository. A new patch from Thomas Adam was added:

http://fvwm.lair.be/viewtopic.php?f=40&t=1861&p=10437#p10437

http://fvwm.lair.be wrote:
You are not authorised to read this forum.
:cry:
Back to top
View user's profile Send private message
i92guboj
Moderator
Moderator


Joined: 30 Nov 2004
Posts: 10089
Location: Córdoba (Spain)

PostPosted: Tue Aug 21, 2007 2:51 am    Post subject: Reply with quote

bMd wrote:
i92guboj wrote:
I just uploaded r16 to the live-ebuilds svn repository. A new patch from Thomas Adam was added:

http://fvwm.lair.be/viewtopic.php?f=40&t=1861&p=10437#p10437

http://fvwm.lair.be wrote:
You are not authorised to read this forum.
:cry:


There seems to be some problem with the fvwm forums right now.

That section is new in the forums, and maybe the permissions are not ok or something. I already notified Thomas Adam about that issue. Hopefully it can be fixed soon enough. However, if you want to take a look to the Thomas Adam's patches, you can also take a look at them here:

http://edulinux.homeunix.org/fvwm/patches.html

That patch is included into my patchset, unchanged. The muticoloured borders patch, from Thomas Adam, is also in my patchset, but was modified by me, so, if it screws up in some funny way, don't report the problem to Thomas Adam. The patchset can be found in my site, as always:

http://jesgue.homelinux.org/fvwm-files/fvwm-patchset-20070819.tar.bz2

Some extra files, patches, previous versions of the patchest and more stuff is available as well:

http://jesgue.homelinux.org/fvwm-files/index.php

You can also pick the "live-ebuilds" overlay using layman, and emerge fvwm-live, which is included there. Take a look to the use flags to turn on/off the patches.

Just a reminder for those that just joined (in case there are any) :P

Regards.
_________________
Gentoo Handbook | My website
Back to top
View user's profile Send private message
outp0st
n00b
n00b


Joined: 13 Apr 2005
Posts: 11

PostPosted: Tue Aug 21, 2007 8:37 am    Post subject: Reply with quote

I;ve been tryin to emerge last r16 from layman live-ebuild overlay. I'm getting the following error output:

make[2]: Entering directory `/var/tmp/portage/x11-wm/fvwm-live-0.1-r16/work/fvwm/doc/fvwm'
path "../../doc":"../../doc/commands" \
--xinclude \
--stringparam profile.attribute output \
--stringparam profile.value man \
-o fvwm.man.xml.p \
./../docbook-xsl/profiling/profile.xsl "./fvwm.man.xml"
/bin/sh: path: command not found
make[2]: [fvwm.1] Error 127 (ignored)
path "../../doc":"../../doc/commands" \
--xinclude \
./../fvwm-man.xsl fvwm.man.xml.p && rm fvwm.man.xml.p
/bin/sh: path: command not found
make[2]: [fvwm.1] Error 127 (ignored)
make[3]: Entering directory `/var/tmp/portage/x11-wm/fvwm-live-0.1-r16/work/fvwm/doc/fvwm'
make[3]: Nothing to be done for `install-exec-am'.
test -z "/usr/share/doc/fvwm/fvwm" || /bin/mkdir -p "/var/tmp/portage/x11-wm/fvwm-live-0.1-r16/image//usr/share/doc/fvwm/fvwm"
path "../../doc":"../../doc/commands" \
--xinclude \
--stringparam profile.attribute output \
--stringparam profile.value man \
-o fvwm.man.xml.p \
./../docbook-xsl/profiling/profile.xsl "./fvwm.man.xml"
/bin/sh: path: command not found
make[3]: [fvwm.1] Error 127 (ignored)
path "../../doc":"../../doc/commands" \
--xinclude \
./../fvwm-man.xsl fvwm.man.xml.p && rm fvwm.man.xml.p
/bin/sh: path: command not found
make[3]: [fvwm.1] Error 127 (ignored)
test -z "/usr/share/man/man1" || /bin/mkdir -p "/var/tmp/portage/x11-wm/fvwm-live-0.1-r16/image//usr/share/man/man1"
/usr/bin/install -c -m 644 'fvwm.1' '/var/tmp/portage/x11-wm/fvwm-live-0.1-r16/image//usr/share/man/man1/fvwm.1'
/usr/bin/install: cannot stat `fvwm.1': No such file or directory
make[3]: *** [install-man1] Error 1
make[3]: Leaving directory `/var/tmp/portage/x11-wm/fvwm-live-0.1-r16/work/fvwm/doc/fvwm'
make[2]: *** [install-am] Error 2
make[2]: Leaving directory `/var/tmp/portage/x11-wm/fvwm-live-0.1-r16/work/fvwm/doc/fvwm'
make[1]: *** [install-recursive] Error 1
make[1]: Leaving directory `/var/tmp/portage/x11-wm/fvwm-live-0.1-r16/work/fvwm/doc'
make: *** [install-recursive] Error 1
*
* ERROR: x11-wm/fvwm-live-0.1-r16 failed.
* Call stack:
* ebuild.sh, line 1654: Called dyn_install
* ebuild.sh, line 1089: Called qa_call 'src_install'
* ebuild.sh, line 44: Called src_install
* fvwm-live-0.1-r16.ebuild, line 161: Called die
*
* (no error message)
* If you need support, post the topmost build error, and the call stack if relevant.
* A complete build log is located at '/var/tmp/portage/x11-wm/fvwm-live-0.1-r16/temp/build.log'.
*

* Messages for package x11-wm/fvwm-live-0.1-r16:

*
* ERROR: x11-wm/fvwm-live-0.1-r16 failed.
* Call stack:
* ebuild.sh, line 1654: Called dyn_install
* ebuild.sh, line 1089: Called qa_call 'src_install'
* ebuild.sh, line 44: Called src_install
* fvwm-live-0.1-r16.ebuild, line 161: Called die
*
* (no error message)
* If you need support, post the topmost build error, and the call stack if relevant.
* A complete build log is located at '/var/tmp/portage/x11-wm/fvwm-live-0.1-r16/temp/build.log'.
*
localhost ~ #






From what I see, the souruce compiles nicely, but file fvwm.1 is missing in
/v/tmp/portage/x11-wm/fvwm-live-0.1-r16/image/usr/share/man/man1/directory(there is only fvwm2.1 softlink to the non-existent fvwm.1 file) :?:
Back to top
View user's profile Send private message
i92guboj
Moderator
Moderator


Joined: 30 Nov 2004
Posts: 10089
Location: Córdoba (Spain)

PostPosted: Tue Aug 21, 2007 12:16 pm    Post subject: Reply with quote

bMd wrote:
i92guboj wrote:
I just uploaded r16 to the live-ebuilds svn repository. A new patch from Thomas Adam was added:

http://fvwm.lair.be/viewtopic.php?f=40&t=1861&p=10437#p10437

http://fvwm.lair.be wrote:
You are not authorised to read this forum.
:cry:


This has already been fixed.

outp0st wrote:
I;ve been tryin to emerge last r16 from layman live-ebuild overlay. I'm getting the following error output:

[...]


From what I see, the souruce compiles nicely, but file fvwm.1 is missing in
/v/tmp/portage/x11-wm/fvwm-live-0.1-r16/image/usr/share/man/man1/directory(there is only fvwm2.1 softlink to the non-existent fvwm.1 file) :?:


They are doing a lot of changes related to the documentation in the last few weeks, overall, aimed to get rid of some build dependencies and some funky stuff that's been around for quite some time. So, at times, that part of the cvs might be broken. I don't really know if that's what happened. Just try to re-emerge again and see if some files are updated from cvs. If not, then stop the merge and erase /usr/portage/distfiles/cvs-src/fvwm/, maybe there is something broken in your local copy.

Then emerge again. If the error continues then we will look into it. Right now I can't reproduce it.
_________________
Gentoo Handbook | My website
Back to top
View user's profile Send private message
Zagloj
Guru
Guru


Joined: 17 Jun 2005
Posts: 314

PostPosted: Tue Aug 21, 2007 2:14 pm    Post subject: Reply with quote

Thanks for the work and no problem here
Code:
16:14:17      0 [fvwm][main]: <<DEBUG>> Entered, about to parse args
fvwm 2.5.22 (from cvs) compiled on Aug 20 2007 at 01:41:52
with support for: ReadLine, Stroke, XPM, PNG, SVG, Shape, XShm, SM, XRender, XCursor, XFT, NLS


Bye ;)
_________________
Your ideology seems to be: "I hate the fanatics, we shoud kill them all" juantxorena dixit.
Back to top
View user's profile Send private message
i92guboj
Moderator
Moderator


Joined: 30 Nov 2004
Posts: 10089
Location: Córdoba (Spain)

PostPosted: Wed Aug 29, 2007 3:09 pm    Post subject: Reply with quote

Hello.

Lately, the fvwm-workers list has been a bit busy. Today they released 2.5.22 at last. So, if you re-emerge the CVS ebuild you will from now on get version 2.5.23. The .22 release should in short be packaged and available for download from the fvwm home page. I just wanted to drop a note here about it. I think it is a good moment to re-emerge your fvwm builds and get the latest bugfixes.

The ebuilds hasn't changed.
_________________
Gentoo Handbook | My website
Back to top
View user's profile Send private message
Zagloj
Guru
Guru


Joined: 17 Jun 2005
Posts: 314

PostPosted: Thu Aug 30, 2007 9:57 am    Post subject: Reply with quote

Btw thanks for the advice, updated without problems ;)
_________________
Your ideology seems to be: "I hate the fanatics, we shoud kill them all" juantxorena dixit.
Back to top
View user's profile Send private message
ThomasAdam
Guru
Guru


Joined: 20 Mar 2005
Posts: 447
Location: England

PostPosted: Sat Sep 01, 2007 1:36 pm    Post subject: Reply with quote

i92guboj wrote:
I just uploaded r16 to the live-ebuilds svn repository. A new patch from Thomas Adam was added:


It's now part of the just-released FVWM 2.5.23 version, so you'll have to remove it from your patchset.

-- Thomas Adam
Back to top
View user's profile Send private message
i92guboj
Moderator
Moderator


Joined: 30 Nov 2004
Posts: 10089
Location: Córdoba (Spain)

PostPosted: Sat Sep 01, 2007 2:53 pm    Post subject: Reply with quote

ThomasAdam wrote:
i92guboj wrote:
I just uploaded r16 to the live-ebuilds svn repository. A new patch from Thomas Adam was added:


It's now part of the just-released FVWM 2.5.23 version, so you'll have to remove it from your patchset.

-- Thomas Adam


Yep. I have been waiting for this, since I was seeking the debate about your patch in the fvwm workers list. I knew it was a matter of a few hours. So I had it prepared. I just arrived home and saw it has already been done, so I submitted it to the live-ebuilds overlay svn repository, with a couple of minor fixes about naming of the files. Your patch has been removed from the new patchset since it is already in the fvwm cvs branch.

For everyone, if you want to get 2.5.23, as Thomas Adam kindly pointed out, you are going to have a problem with previous patchsets. So, upgrade to -r17. You first need to sync with "layman -s live-ebuilds" or simply "layman -S".

If someone wants an ebuild in the old format, let me know. For now, I just submited it into live-ebuilds.

Thanks, Thomas Adam, and the rest :)

EDIT, Bumped to r18. My patch for new test conditions has been removed as well. I don't use anymore, and the last updates broke it. In case anyone is interested, let me know and I will possibly fix it. But if no one is using it, I will simply drop it, since it is no longer of any use for me.
_________________
Gentoo Handbook | My website
Back to top
View user's profile Send private message
i92guboj
Moderator
Moderator


Joined: 30 Nov 2004
Posts: 10089
Location: Córdoba (Spain)

PostPosted: Wed Sep 12, 2007 9:07 pm    Post subject: Reply with quote

Several fixes on the ebuild have been commited to the live-ebuilds overlay while the forum update was taking place. Current is now -r21. Just ebuild stuff like flags, deps and so on. The png and doc flags (that were broken) now actually do something. The xlock patch is just a distro specific patch, so I enabled it unconditionally and removed the flag (it is a trivial patch).
_________________
Gentoo Handbook | My website
Back to top
View user's profile Send private message
yngwin
Developer
Developer


Joined: 19 Dec 2002
Posts: 4396
Location: Suzhou, China

PostPosted: Thu Sep 13, 2007 12:10 pm    Post subject: Reply with quote

I'll drop this from berkano overlay then, as it's available in live-ebuilds overlay.
_________________
"Those who deny freedom to others deserve it not for themselves." - Abraham Lincoln
Free Culture | Defective by Design | EFF
Back to top
View user's profile Send private message
i92guboj
Moderator
Moderator


Joined: 30 Nov 2004
Posts: 10089
Location: Córdoba (Spain)

PostPosted: Sat Jan 26, 2008 3:45 pm    Post subject: Reply with quote

Hello,

It's been some time since the last update, but nothing was needed during all this time.

Lately there's been some talk on the lists about the locale chartset issue (a thing that has been there since I can remember). That was why the default charset patch was needed. Yes, you read ok: "was". That has been finally addressed by a patch from Olivier Chapuis. I have just updated and uploaded an updated abuild to live-ebuilds right now.

The default-charset (or whatever it was called) used flag, has been removed, since it is no longer required. The ebuild has been corrected. The patch is still in the patchset, in case someone wants it for some odd reason, it will be removed soon, but I am too lazy and don't want to package a new patchset right now.

Enjoy.
_________________
Gentoo Handbook | My website
Back to top
View user's profile Send private message
i92guboj
Moderator
Moderator


Joined: 30 Nov 2004
Posts: 10089
Location: Córdoba (Spain)

PostPosted: Sun Jan 27, 2008 5:01 pm    Post subject: Reply with quote

For some reason, the name of the overlay changed. Do this to keep in sync if you are using the live-ebuilds overlay:

Code:
layman -f -o http://svn.engelkotzen.net/public/devnull/layman.xml -a devnull


In some hours it should be in the official layman list, though. Then the live-ebuilds overlay will not exist anymore, as it has been renamed as "devnull".
_________________
Gentoo Handbook | My website
Back to top
View user's profile Send private message
Dominique_71
Veteran
Veteran


Joined: 17 Aug 2005
Posts: 1507
Location: Switzerland (Romandie)

PostPosted: Sun Mar 09, 2008 7:43 pm    Post subject: Reply with quote

I just updated fvwm with this ebuild. It break fvwm-crystal. I also think that /etc/X11/Sessions/fvwm2 will not work anymore. The problem is that /usr/bin/fvwm2 is not installed.

The solution for me was to make a symlink /usr/bin/fvwm2 -> /usr/bin/fvwm.
_________________
[[[ To any NSA and FBI agents reading that text: please consider ]]]
[[[ whether defending the US Constitution against all enemies, ]]]
[[[ foreign or domestic, requires you to follow Snowden's example. ]]]
Back to top
View user's profile Send private message
ThomasAdam
Guru
Guru


Joined: 20 Mar 2005
Posts: 447
Location: England

PostPosted: Sun Mar 09, 2008 7:51 pm    Post subject: Reply with quote

Dominique_71 wrote:
I just updated fvwm with this ebuild. It break fvwm-crystal. I also think that /etc/X11/Sessions/fvwm2 will not work anymore. The problem is that /usr/bin/fvwm2 is not installed.

The solution for me was to make a symlink /usr/bin/fvwm2 -> /usr/bin/fvwm.


FVWM dropped the fvwm2 naming convention of its binaries ages ago. FVWM-Crystal should need only ever look for the presence of the fvwm binary -- *especially* since it is tracking 2.5.X which follows this naming convention anyway.

-- Thomas Adam
Back to top
View user's profile Send private message
Dominique_71
Veteran
Veteran


Joined: 17 Aug 2005
Posts: 1507
Location: Switzerland (Romandie)

PostPosted: Sun Mar 09, 2008 8:18 pm    Post subject: Reply with quote

ThomasAdam wrote:
Dominique_71 wrote:
I just updated fvwm with this ebuild. It break fvwm-crystal. I also think that /etc/X11/Sessions/fvwm2 will not work anymore. The problem is that /usr/bin/fvwm2 is not installed.

The solution for me was to make a symlink /usr/bin/fvwm2 -> /usr/bin/fvwm.


FVWM dropped the fvwm2 naming convention of its binaries ages ago. FVWM-Crystal should need only ever look for the presence of the fvwm binary -- *especially* since it is tracking 2.5.X which follows this naming convention anyway.

-- Thomas Adam


Thank you Thomas for the explanation. The problem here is that gentoo is still using the old naming convention in official portage. So are the official fvwm and fvwm-crystal ebuilds.

Another problem is in the live ebuild: it generate /etc/X11/Sessions/fvwm2 which use /usr/bin/fvwm2 instead of /usr/bin/fvwm.
_________________
[[[ To any NSA and FBI agents reading that text: please consider ]]]
[[[ whether defending the US Constitution against all enemies, ]]]
[[[ foreign or domestic, requires you to follow Snowden's example. ]]]
Back to top
View user's profile Send private message
i92guboj
Moderator
Moderator


Joined: 30 Nov 2004
Posts: 10089
Location: Córdoba (Spain)

PostPosted: Mon Mar 10, 2008 11:14 am    Post subject: Reply with quote

I could fix it. But since the ebuild does nothing special. I think that this belongs upstream. It's nothing specific to the ebuild itself.
_________________
Gentoo Handbook | My website
Back to top
View user's profile Send private message
Dominique_71
Veteran
Veteran


Joined: 17 Aug 2005
Posts: 1507
Location: Switzerland (Romandie)

PostPosted: Mon Mar 10, 2008 5:26 pm    Post subject: Reply with quote

i92guboj wrote:
I could fix it. But since the ebuild does nothing special. I think that this belongs upstream. It's nothing specific to the ebuild itself.

Into src_install():
Code:
   echo "#!/bin/bash" > fvwm2
   echo "exec /usr/bin/fvwm2" >> fvwm2

   exeinto /etc/X11/Sessions
   doexe fvwm2

That implies that this is the ebuild that create and install /etc/X11/Sessions/fvvwm2.
A problem is that fvwm exist in ${S}. This is a directory. The following code will work into the ebuild:
Code:
   echo "#!/bin/bash" > fvwm/fvwm
   echo "exec /usr/bin/fvwm" >> fvwm/fvwm

   exeinto /etc/X11/Sessions
   doexe fvwm/fvwm

The compilation create fvwm and the ebuild install it in /usr/bin/fvwm. It is no /usr/bin/fvwm2. And that is 100% correct.
A workaround would be to create a symlink /usr/bin/fvwm2 to /usr/bin/fvwm. But it is much better to fix things as to make a workaround.

This fix will break fvwm-crystal. I just checked it, and this is the file in ${FILESDIR} that still use fvwm2. So, portage issue.
_________________
[[[ To any NSA and FBI agents reading that text: please consider ]]]
[[[ whether defending the US Constitution against all enemies, ]]]
[[[ foreign or domestic, requires you to follow Snowden's example. ]]]
Back to top
View user's profile Send private message
swimmer
Veteran
Veteran


Joined: 15 Jul 2002
Posts: 1291
Location: Netherlands

PostPosted: Wed Apr 02, 2008 8:45 am    Post subject: Reply with quote

Since a week or two fvwm-cvs bails out on 04-FlatSeparators.patch:

Quote:

***** 04-FlatSeparators.patch *****

===================================

PATCH COMMAND: patch -p0 -g0 -E --no-backup-if-mismatch < /var/tmp/portage/x11-wm/fvwm-9999/work/patchset/extras/04-FlatSeparators.patch

===================================
patching file fvwm/menuitem.c
Hunk #2 succeeded at 389 with fuzz 2 (offset 55 lines).
Hunk #3 succeeded at 608 (offset 63 lines).
Hunk #4 succeeded at 630 (offset 63 lines).
Hunk #5 succeeded at 672 (offset 63 lines).
Hunk #6 succeeded at 686 (offset 63 lines).
patching file fvwm/menustyle.c
Hunk #1 FAILED at 398.
Hunk #2 succeeded at 902 (offset 60 lines).
Hunk #3 FAILED at 1590.
Hunk #4 succeeded at 1856 (offset 70 lines).
2 out of 4 hunks FAILED -- saving rejects to file fvwm/menustyle.c.rej
patching file fvwm/menus.c
Hunk #1 succeeded at 1634 (offset -729 lines).
patching file fvwm/menustyle.h
Hunk #2 succeeded at 281 (offset 4 lines).
===================================

PATCH COMMAND: patch -p1 -g0 -E --no-backup-if-mismatch < /var/tmp/portage/x11-wm/fvwm-9999/work/patchset/extras/04-FlatSeparators.patch

===================================
can't find file to patch at input line 5
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: fvwm/menuitem.c
|===================================================================
|--- fvwm/menuitem.c (revision 4)
|+++ fvwm/menuitem.c (revision 5)
--------------------------
No file to patch. Skipping patch.
6 out of 6 hunks ignored
can't find file to patch at input line 83
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: fvwm/menustyle.c
|===================================================================
|--- fvwm/menustyle.c (revision 4)
|+++ fvwm/menustyle.c (revision 5)
--------------------------
No file to patch. Skipping patch.
4 out of 4 hunks ignored
can't find file to patch at input line 125
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: fvwm/menus.c
|===================================================================
|--- fvwm/menus.c (revision 4)
|+++ fvwm/menus.c (revision 5)
--------------------------
No file to patch. Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 140
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: fvwm/menustyle.h
|===================================================================
|--- fvwm/menustyle.h (revision 4)
|+++ fvwm/menustyle.h (revision 5)
--------------------------
No file to patch. Skipping patch.
2 out of 2 hunks ignored
===================================

PATCH COMMAND: patch -p2 -g0 -E --no-backup-if-mismatch < /var/tmp/portage/x11-wm/fvwm-9999/work/patchset/extras/04-FlatSeparators.patch

===================================
missing header for unified diff at line 5 of patch
can't find file to patch at input line 5
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: fvwm/menuitem.c
|===================================================================
|--- fvwm/menuitem.c (revision 4)
|+++ fvwm/menuitem.c (revision 5)
--------------------------
No file to patch. Skipping patch.
6 out of 6 hunks ignored
missing header for unified diff at line 83 of patch
can't find file to patch at input line 83
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: fvwm/menustyle.c
|===================================================================
|--- fvwm/menustyle.c (revision 4)
|+++ fvwm/menustyle.c (revision 5)
--------------------------
No file to patch. Skipping patch.
4 out of 4 hunks ignored
missing header for unified diff at line 125 of patch
can't find file to patch at input line 125
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: fvwm/menus.c
|===================================================================
|--- fvwm/menus.c (revision 4)
|+++ fvwm/menus.c (revision 5)
--------------------------
No file to patch. Skipping patch.
1 out of 1 hunk ignored
missing header for unified diff at line 140 of patch
can't find file to patch at input line 140
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: fvwm/menustyle.h
|===================================================================
|--- fvwm/menustyle.h (revision 4)
|+++ fvwm/menustyle.h (revision 5)
--------------------------
No file to patch. Skipping patch.
2 out of 2 hunks ignored
===================================

...


i92guboj: can you have a look at this?

Greetz
swimmer
Back to top
View user's profile Send private message
bMd
Tux's lil' helper
Tux's lil' helper


Joined: 07 Jul 2004
Posts: 110

PostPosted: Sat Apr 05, 2008 2:51 pm    Post subject: Reply with quote

Seems following patches wont apply

Quote:
04-FlatSeparators.patch
07-FluxRoundedCorners.patch
09-TopBorder.patch
11-MultiBorder.patch
14-FvwmButtonsTips.patch
Back to top
View user's profile Send private message
univac^
Apprentice
Apprentice


Joined: 19 Sep 2004
Posts: 231
Location: Suwalki, Polska

PostPosted: Sat Apr 05, 2008 7:09 pm    Post subject: Reply with quote

true, we should fix them

Me first:

04-FlatSeparators-fix.patch

Code:

diff -Naur ../fvwm.orig/fvwm/menuitem.c fvwm/menuitem.c
--- ../fvwm.orig/fvwm/menuitem.c   2008-04-04 23:53:12.000000000 +0200
+++ fvwm/menuitem.c   2008-04-04 23:59:50.000000000 +0200
@@ -82,10 +82,19 @@
  *
  */
 static void draw_separator(
-   Window w, GC TopGC, GC BottomGC, int x1, int y, int x2)
+   Window w, GC TopGC, GC BottomGC, GC ForeGC, int x1, int y, int x2,
+    Bool do_flat_separators)
 {
-   XDrawLine(dpy, w, TopGC   , x1,   y,   x2,   y);
-   XDrawLine(dpy, w, BottomGC, x1-1, y+1, x2+1, y+1);
+   if (do_flat_separators)
+    {
+        XDrawLine(dpy, w, ForeGC, x1, y, x2, y);
+    }
+    else
+    {
+        XDrawLine(dpy, w, TopGC   , x1,   y,   x2,   y);
+        XDrawLine(dpy, w, BottomGC, x1-1, y+1, x2+1, y+1);
+    }
+
 
    return;
 }
@@ -381,6 +390,7 @@
    /*Pixel fg, fgsh;*/
    int relief_thickness = ST_RELIEF_THICKNESS(ms);
    Bool is_item_selected;
+    Bool do_flat_separators;
    Bool item_cleared = False;
    Bool xft_clear = False;
    Bool empty_inter = False;
@@ -599,6 +609,8 @@
     * Draw the item itself.
     */
 
+    do_flat_separators = ST_DO_FLAT_SEPARATOR(ms);
+
    /* Calculate the separator offsets. */
    if (ST_HAS_LONG_SEPARATORS(ms))
    {
@@ -619,9 +631,9 @@
       {
          /* It's a separator. */
          draw_separator(
-            mpip->w, gcs.shadow_gc, gcs.hilight_gc, sx1,
-            y_offset + y_height - MENU_SEPARATOR_HEIGHT,
-            sx2);
+             mpip->w, gcs.shadow_gc, gcs.hilight_gc, gcs.fore_gc,
+                sx1, y_offset + y_height - MENU_SEPARATOR_HEIGHT,
+                sx2, do_flat_separators);
          /* Nothing else to do. */
       }
       return;
@@ -675,8 +687,8 @@
          {
             y = y_offset + y_height - MENU_SEPARATOR_HEIGHT;
             draw_separator(
-               mpip->w, gcs.shadow_gc, gcs.hilight_gc,
-               sx1, y, sx2);
+               mpip->w, gcs.shadow_gc, gcs.hilight_gc, gcs.fore_gc,
+                    sx1, y, sx2, do_flat_separators);
          }
          break;
       default:
diff -Naur ../fvwm.orig/fvwm/menus.c fvwm/menus.c
--- ../fvwm.orig/fvwm/menus.c   2008-04-04 23:53:12.000000000 +0200
+++ fvwm/menus.c   2008-04-05 00:05:08.000000000 +0200
@@ -1634,6 +1634,10 @@
       separator_height = (last_item_has_relief) ?
          MENU_SEPARATOR_HEIGHT + relief_thickness :
          MENU_SEPARATOR_TOTAL_HEIGHT;
+        if (MST_DO_FLAT_SEPARATOR(msp->menu))
+        {
+            separator_height += 1;
+        }
       MI_Y_OFFSET(mi) = y;
       if (MI_IS_TITLE(mi))
       {
diff -Naur ../fvwm.orig/fvwm/menustyle.c fvwm/menustyle.c
--- ../fvwm.orig/fvwm/menustyle.c   2008-04-04 23:53:12.000000000 +0200
+++ fvwm/menustyle.c   2008-04-05 00:03:59.000000000 +0200
@@ -426,7 +426,7 @@
       "MouseWheel", "ScrollOffPage",
       "TrianglesUseFore",
       "TitleColorset", "HilightTitleBack",
-      "TitleFont",
+      "TitleFont", "FlatSeparators",
       "VerticalMargins",
       NULL
    };
@@ -902,6 +902,7 @@
          ST_SCROLL_OFF_PAGE(tmpms) = 1;
          ST_DO_HILIGHT_TITLE_BACK(tmpms) = 0;
          ST_USING_DEFAULT_TITLEFONT(tmpms) = True;
+            ST_DO_FLAT_SEPARATOR(tmpms) = 0;
          has_gc_changed = True;
          option = "fvwm";
       }
@@ -1597,6 +1598,9 @@
             &ST_VERTICAL_MARGIN_BOTTOM(tmpms),
             0, 0);
          break;
+        case 63: /* FlatSeparators */
+            ST_DO_FLAT_SEPARATOR(tmpms) = on;
+            break;
 
 #if 0
       case 99: /* PositionHints */
@@ -1853,6 +1857,8 @@
    ST_TRIANGLES_USE_FORE(destms) = ST_TRIANGLES_USE_FORE(origms);
    /* Title */
    ST_DO_HILIGHT_TITLE_BACK(destms) = ST_DO_HILIGHT_TITLE_BACK(origms);
+    /* FlatSeparators */
+    ST_DO_FLAT_SEPARATOR(destms) = ST_DO_FLAT_SEPARATOR(origms);
 
    menustyle_update(destms);
 
diff -Naur ../fvwm.orig/fvwm/menustyle.h fvwm/menustyle.h
--- ../fvwm.orig/fvwm/menustyle.h   2008-04-04 23:53:12.000000000 +0200
+++ fvwm/menustyle.h   2008-04-05 00:06:02.000000000 +0200
@@ -23,6 +23,8 @@
 #define MST_FACE(m)                   ((m)->s->ms->look.face)
 #define ST_DO_HILIGHT_BACK(s)         ((s)->look.flags.do_hilight_back)
 #define MST_DO_HILIGHT_BACK(m)        ((m)->s->ms->look.flags.do_hilight_back)
+#define ST_DO_FLAT_SEPARATOR(s)       ((s)->look.flags.do_flat_separator)
+#define MST_DO_FLAT_SEPARATOR(m)      ((m)->s->ms->look.flags.do_flat_separator)
 #define ST_DO_HILIGHT_FORE(s)         ((s)->look.flags.do_hilight_fore)
 #define MST_DO_HILIGHT_FORE(m)        ((m)->s->ms->look.flags.do_hilight_fore)
 #define ST_DO_HILIGHT_TITLE_BACK(s)   ((s)->look.flags.do_hilight_title_back)
@@ -279,6 +281,7 @@
       unsigned has_title_cset : 1;
       unsigned do_hilight_title_back : 1;
       unsigned using_default_titlefont : 1;
+        unsigned do_flat_separator : 1;
    } flags;
    unsigned char ReliefThickness;
    unsigned char TitleUnderlines;

_________________
Gentoo own3d
Back to top
View user's profile Send private message
i92guboj
Moderator
Moderator


Joined: 30 Nov 2004
Posts: 10089
Location: Córdoba (Spain)

PostPosted: Sun May 11, 2008 3:17 pm    Post subject: Reply with quote

I am fixing all the stuff in the ebuild right now.

The ebuild has been remade. Since I am now the proxy maintainer for the official portage ebuild, I am porting all the stuff of what will basically be the new ebuild for fvwm in the official portage, to this cvs ebuild.

Some patches have been broken by the VerticalSeparators patch that I made, which has been merged into the official fvwm branch as of 2.5.26, which is the current version of fvwm. I have been busy these last weeks, but I haven't fogotten about this ebuild :P

Someone in the fvwm forums pm'ed me with a fixed patchset, I haven't done any tests, but I have updated the devnull repository with the new ebuild. You can update it via layman right now. It's completelly untested stuff right now, so, I will make many more commits this evening probably. If you are around, feel free to test it and see if it works or not. It will surely need some polishing.

Cheers, fvwmers :P

EDITED: Right now, all the patches seem to apply cleanly and the new ebuild seems to work.

I wish also to give credit to:

- David Shakaryan (I hope I spelled it correctly) for giving this ebuild some attention and recruiting me as proxy maintainer
- Warnaud fro the fvwm forums, for the fixed patchset
- Dominik Vogt and Thomas Adam, for helping me to fix some dependency issues and some doubts about gtk and perl in the fvwm-workers mailing list
- The unknown person who did the original patchset
- Tavis Ormandi, because the original ebuilds were from him, as far as I know.
- And of course, to all of you for using this thing and helping to improve it everyday ;)

I hope I am not forgetting someone.
_________________
Gentoo Handbook | My website
Back to top
View user's profile Send private message
Display posts from previous:   
Reply to topic    Gentoo Forums Forum Index Unsupported Software All times are GMT
Goto page Previous  1, 2, 3, 4, 5, 6, 7, 8  Next
Page 6 of 8

 
Jump to:  
You cannot post new topics in this forum
You cannot reply to topics in this forum
You cannot edit your posts in this forum
You cannot delete your posts in this forum
You cannot vote in polls in this forum