Update to worker-4.5.1
This is a bugfix release that fixes the 32-bit build error I reported, so all the patches go away. Tested on amd64 and i386.
This commit is contained in:
parent
2e158eebad
commit
94709d745c
@ -1,9 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.46 2020/08/21 03:22:50 bcallah Exp $
|
||||
# $OpenBSD: Makefile,v 1.47 2020/08/26 22:44:48 bcallah Exp $
|
||||
|
||||
BROKEN-hppa = no atomic ops
|
||||
COMMENT = Midnight Commander-like file manager for X
|
||||
DISTNAME = worker-4.5.0
|
||||
REVISION = 0
|
||||
DISTNAME = worker-4.5.1
|
||||
CATEGORIES = x11
|
||||
|
||||
HOMEPAGE = http://www.boomerangsworld.de/
|
||||
|
@ -1,2 +1,2 @@
|
||||
SHA256 (worker-4.5.0.tar.gz) = uqyyldmSmST1LBeZC/+iGJDIcac1VIndI5egs8NruQs=
|
||||
SIZE (worker-4.5.0.tar.gz) = 2306046
|
||||
SHA256 (worker-4.5.1.tar.gz) = 3JvNODg8fsmhXeottMBVzh0iRIu/n61INsQFb1moi0M=
|
||||
SIZE (worker-4.5.1.tar.gz) = 2306246
|
||||
|
@ -1,24 +0,0 @@
|
||||
$OpenBSD: patch-src_aguix_aguix_cc,v 1.1 2020/08/21 03:22:50 bcallah Exp $
|
||||
|
||||
This needs to be unsigned for 32-bit.
|
||||
|
||||
Index: src/aguix/aguix.cc
|
||||
--- src/aguix/aguix.cc.orig
|
||||
+++ src/aguix/aguix.cc
|
||||
@@ -4373,14 +4373,14 @@ bool AGUIX::isModifierPressed( unsigned int mask )
|
||||
return m_modifier_pressed & mask;
|
||||
}
|
||||
|
||||
-void AGUIX::setStandardIconData( const long *data,
|
||||
+void AGUIX::setStandardIconData( const unsigned long *data,
|
||||
size_t data_length )
|
||||
{
|
||||
m_net_wm_icon_data = data;
|
||||
m_net_wm_icon_data_length = data_length;
|
||||
}
|
||||
|
||||
-bool AGUIX::getStandardIconData( const long **return_data,
|
||||
+bool AGUIX::getStandardIconData( const unsigned long **return_data,
|
||||
size_t *return_data_length ) const
|
||||
{
|
||||
if ( ! m_net_wm_icon_data ) return false;
|
@ -1,28 +0,0 @@
|
||||
$OpenBSD: patch-src_aguix_aguix_h,v 1.1 2020/08/21 03:22:50 bcallah Exp $
|
||||
|
||||
This needs to be unsigned for 32-bit.
|
||||
|
||||
Index: src/aguix/aguix.h
|
||||
--- src/aguix/aguix.h.orig
|
||||
+++ src/aguix/aguix.h
|
||||
@@ -375,9 +375,9 @@ class AGUIX { (public)
|
||||
|
||||
bool isModifierPressed( unsigned int mask );
|
||||
|
||||
- void setStandardIconData( const long *data,
|
||||
+ void setStandardIconData( const unsigned long *data,
|
||||
size_t data_length );
|
||||
- bool getStandardIconData( const long **return_data,
|
||||
+ bool getStandardIconData( const unsigned long **return_data,
|
||||
size_t *return_data_length ) const;
|
||||
private:
|
||||
Display *dsp;
|
||||
@@ -647,7 +647,7 @@ class AGUIX { (public)
|
||||
|
||||
unsigned int m_modifier_pressed = 0;
|
||||
|
||||
- const long *m_net_wm_icon_data = NULL;
|
||||
+ const unsigned long *m_net_wm_icon_data = NULL;
|
||||
size_t m_net_wm_icon_data_length = 0;
|
||||
};
|
||||
|
@ -1,16 +0,0 @@
|
||||
$OpenBSD: patch-src_aguix_awindow_cc,v 1.1 2020/08/21 03:22:50 bcallah Exp $
|
||||
|
||||
This needs to be unsigned for 32-bit.
|
||||
|
||||
Index: src/aguix/awindow.cc
|
||||
--- src/aguix/awindow.cc.orig
|
||||
+++ src/aguix/awindow.cc
|
||||
@@ -1626,7 +1626,7 @@ Widget *AWindow::findWidgetForRootPos( int rx, int ry
|
||||
|
||||
void AWindow::applyIcon()
|
||||
{
|
||||
- const long *data = NULL;
|
||||
+ const unsigned long *data = NULL;
|
||||
size_t data_length = 0;
|
||||
|
||||
if ( ! _aguix->getStandardIconData( &data, &data_length ) ) {
|
@ -1,13 +0,0 @@
|
||||
$OpenBSD: patch-src_worker_net_wm_icon_h,v 1.1 2020/08/21 03:22:50 bcallah Exp $
|
||||
|
||||
This needs to be unsigned for 32-bit.
|
||||
|
||||
Index: src/worker_net_wm_icon.h
|
||||
--- src/worker_net_wm_icon.h.orig
|
||||
+++ src/worker_net_wm_icon.h
|
||||
@@ -1,4 +1,4 @@
|
||||
-static const long worker_net_wm_icon_data[] = {
|
||||
+static const unsigned long worker_net_wm_icon_data[] = {
|
||||
16, 16,
|
||||
0xff0e5bd6, 0xff0e5bd6, 0xff0e5bd6, 0xff0e5bd6, 0xff0e5bd6, 0xff0e5bd6, 0xff0e5bd6, 0xff0e5bd6,
|
||||
0xff0e5bd6, 0xff0e5bd6, 0xff0e5bd6, 0xff0e5bd6, 0xff0e5bd6, 0xff0e5bd6, 0xff0e5bd6, 0xff0e5bd6,
|
Loading…
x
Reference in New Issue
Block a user