cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix '--borderless' not working on 64bit systems

Browse Source 
(upstream git commit b5a719d0dc475066eafc5810c2bdc49bca18713a)

Use '%F' since feh supports multiple files
(upstream git commit 865a78510ff53db952ec5de98c934b60bfc664c8)
This commit is contained in:
dcoppa 2013-12-12 09:20:52 +00:00
parent d22e03cc5b
commit a68f075c0d
4 changed files with 67 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
graphics/feh/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.55 2013/12/03 07:37:44 dcoppa Exp $ # $OpenBSD: Makefile,v 1.56 2013/12/12 09:20:52 dcoppa Exp $
COMMENT= lightweight image viewer COMMENT= lightweight image viewer
DISTNAME= feh-2.9.3 DISTNAME= feh-2.9.3
REVISION= 1 REVISION= 2
EXTRACT_SUFX= .tar.bz2 EXTRACT_SUFX= .tar.bz2
CATEGORIES= graphics CATEGORIES= graphics

16
graphics/feh/patches/patch-share_applications_feh_pre Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-share_applications_feh_pre,v 1.1 2013/12/12 09:20:52 dcoppa Exp $
Use '%F' since feh supports multiple files
(upstream git commit 865a78510ff53db952ec5de98c934b60bfc664c8)
--- share/applications/feh.pre.orig Thu Dec 12 10:02:32 2013
+++ share/applications/feh.pre Thu Dec 12 10:02:49 2013
@@ -1,7 +1,7 @@
[Desktop Entry]
Name=Feh
Comment=Fast Imlib2-based Image Viewer
-Exec=feh %f
+Exec=feh %F
Terminal=false
Type=Application
Icon=$IMAGEDIR$/feh.png

25
graphics/feh/patches/patch-src_winwidget_c Normal file
View File

@ -0,0 +1,25 @@
$OpenBSD: patch-src_winwidget_c,v 1.15 2013/12/12 09:20:52 dcoppa Exp $
Fix '--borderless' not working on 64bit systems
(upstream git commit b5a719d0dc475066eafc5810c2bdc49bca18713a)
--- src/winwidget.c.orig Tue Jun 11 08:28:26 2013
+++ src/winwidget.c Thu Dec 12 09:59:49 2013
@@ -228,6 +228,7 @@ void winwidget_create_window(winwidget ret, int w, int
KeyPressMask | KeyReleaseMask | ButtonMotionMask | ExposureMask
| FocusChangeMask | PropertyChangeMask | VisibilityChangeMask;
+ memset(&mwmhints, 0, sizeof(mwmhints));
if (opt.borderless || ret->full_screen) {
prop = XInternAtom(disp, "_MOTIF_WM_HINTS", True);
if (prop == None) {
@@ -240,8 +241,7 @@ void winwidget_create_window(winwidget ret, int w, int
mwmhints.flags = MWM_HINTS_DECORATIONS;
mwmhints.decorations = 0;
}
- } else
- mwmhints.flags = 0;
+ }
ret->win =
XCreateWindow(disp, DefaultRootWindow(disp), x, y, w, h, 0,

24
graphics/feh/patches/patch-src_winwidget_h Normal file
View File

@ -0,0 +1,24 @@
$OpenBSD: patch-src_winwidget_h,v 1.1 2013/12/12 09:20:52 dcoppa Exp $
Fix '--borderless' not working on 64bit systems
(upstream git commit b5a719d0dc475066eafc5810c2bdc49bca18713a)
--- src/winwidget.h.orig Tue Jun 11 08:28:26 2013
+++ src/winwidget.h Thu Dec 12 09:59:49 2013
@@ -61,11 +61,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALI
/* Motif window hints */
typedef struct _mwmhints {
- CARD32 flags;
- CARD32 functions;
- CARD32 decorations;
- INT32 input_mode;
- CARD32 status;
+ unsigned long flags;
+ unsigned long functions;
+ unsigned long decorations;
+ long input_mode;
+ unsigned long status;
} MWMHints;
enum win_type {