afterstep: remove package
uses gtk2, last release from 2013, lot of patching necessary to build with modern tools
This commit is contained in:
Michal Vasilek
parent
1931fd5755
commit
95d5b8f818
|
|
@ -1 +0,0 @@
|
|||
afterstep
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
From: Robert Luberda <robert@debian.org>
|
||||
Date: Wed, 18 Sep 2013 22:34:26 +0200
|
||||
Subject: 39 Fix parallel builds
|
||||
|
||||
Add dependency on libAfterConf to PrintDesktopEntries in order to fix
|
||||
parallel builds failures occurring on our build hosts:
|
||||
|
||||
gcc: error: ../libAfterConf/libAfterConf.a: No such file or directory
|
||||
make[3]: *** [PrintDesktopEntries] Error 1
|
||||
|
||||
https://buildd.debian.org/status/fetch.php?pkg=afterstep&arch=amd64&ver=2.2.12-1&stamp=1379355085
|
||||
---
|
||||
libAfterConf/Makefile.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/libAfterConf/Makefile.in b/libAfterConf/Makefile.in
|
||||
index fa049a3..686a958 100644
|
||||
--- a/libAfterConf/Makefile.in
|
||||
+++ b/libAfterConf/Makefile.in
|
||||
@@ -52,7 +52,7 @@ make_standard_categories: make_standard_categories.o
|
||||
PrintDesktopEntries.o: DesktopEntry.c
|
||||
$(CC) $(CCFLAGS) $(EXTRA_DEFINES) -DPRINT_DESKTOP_ENTRIES $(INCLUDES) $(EXTRA_INCLUDES) -c DesktopEntry.c -o PrintDesktopEntries.o
|
||||
|
||||
-PrintDesktopEntries: PrintDesktopEntries.o
|
||||
+PrintDesktopEntries: PrintDesktopEntries.o $(LIB_STATIC) @LIBPROG@
|
||||
$(CC) PrintDesktopEntries.o $(USER_LD_FLAGS) $(LIBS_ALL) $(LIBS_AFTERIMAGE) -o PrintDesktopEntries
|
||||
|
||||
install.inc:
|
||||
|
|
@ -1,172 +0,0 @@
|
|||
From: Robert Luberda <robert@debian.org>
|
||||
Date: Thu, 19 Sep 2013 00:18:16 +0200
|
||||
Subject: 40 Fix few gcc warnings
|
||||
|
||||
---
|
||||
libAfterImage/import.c | 8 ++++----
|
||||
libAfterImage/ungif.c | 3 ++-
|
||||
src/ASDocGen/ASDocGen.c | 8 ++++----
|
||||
src/ASMount/main.c | 4 ++++
|
||||
src/afterstep/cover.c | 5 ++++-
|
||||
src/afterstep/dbus.c | 2 ++
|
||||
6 files changed, 20 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/libAfterImage/import.c b/libAfterImage/import.c
|
||||
index f2c7ad1..c80b9c3 100644
|
||||
--- a/libAfterImage/import.c
|
||||
+++ b/libAfterImage/import.c
|
||||
@@ -585,7 +585,7 @@ get_thumbnail_asimage( ASImageManager* imageman, const char *file, int thumb_wid
|
||||
|
||||
if (imageman && file)
|
||||
{
|
||||
- sprintf( thumbnail_name, AS_THUMBNAIL_NAME_FORMAT2, len, file, thumb_width, thumb_height, (long) flags) ;
|
||||
+ sprintf( thumbnail_name, AS_THUMBNAIL_NAME_FORMAT2, (long) len, file, thumb_width, thumb_height, (long) flags) ;
|
||||
im = fetch_asimage(imageman, thumbnail_name );
|
||||
}
|
||||
|
||||
@@ -2521,8 +2521,6 @@ xml2ASImage( const char *path, ASImageImportParams *params )
|
||||
ASImage *
|
||||
svg2ASImage( const char * path, ASImageImportParams *params )
|
||||
{
|
||||
- static int gType_inited = 0;
|
||||
-
|
||||
ASImage *im = NULL;
|
||||
GdkPixbuf *pixbuf;
|
||||
int channels ;
|
||||
@@ -2531,6 +2529,8 @@ svg2ASImage( const char * path, ASImageImportParams *params )
|
||||
|
||||
START_TIME(started);
|
||||
#if 1
|
||||
+#ifndef GLIB_VERSION_2_36
|
||||
+ static int gType_inited = 0;
|
||||
/* Damn gtk mess... must init once atleast.. can we just init
|
||||
several times or do we bork then? */
|
||||
if (gType_inited == 0)
|
||||
@@ -2538,7 +2538,7 @@ svg2ASImage( const char * path, ASImageImportParams *params )
|
||||
g_type_init();
|
||||
gType_inited = 1;
|
||||
}
|
||||
-
|
||||
+#endif
|
||||
if( get_flags( params->flags, AS_IMPORT_SCALED_H ) )
|
||||
width = (params->width <= 0)?((params->height<=0)?-1:params->height):params->width ;
|
||||
|
||||
diff --git a/libAfterImage/ungif.c b/libAfterImage/ungif.c
|
||||
index cb9c628..faa1da7 100644
|
||||
--- a/libAfterImage/ungif.c
|
||||
+++ b/libAfterImage/ungif.c
|
||||
@@ -153,7 +153,8 @@ get_gif_image_desc( GifFileType *gif, SavedImage *im )
|
||||
{
|
||||
im->ImageDesc.ColorMap = MakeMapObject(gif->Image.ColorMap->ColorCount, NULL);
|
||||
fseek( gif->UserData, start_pos+9, SEEK_SET );
|
||||
- fread( im->ImageDesc.ColorMap->Colors, 1, gif->Image.ColorMap->ColorCount*3, gif->UserData);
|
||||
+ if (fread( im->ImageDesc.ColorMap->Colors, 1, gif->Image.ColorMap->ColorCount*3, gif->UserData) != gif->Image.ColorMap->ColorCount*3)
|
||||
+ return GIF_ERROR
|
||||
fseek( gif->UserData, end_pos, SEEK_SET );
|
||||
gif->Image.ColorMap = NULL ;
|
||||
}
|
||||
diff --git a/src/ASDocGen/ASDocGen.c b/src/ASDocGen/ASDocGen.c
|
||||
index f8d38e9..bed04b8 100644
|
||||
--- a/src/ASDocGen/ASDocGen.c
|
||||
+++ b/src/ASDocGen/ASDocGen.c
|
||||
@@ -880,7 +880,7 @@ gen_glossary( const char *dest_dir, const char *file, ASDocType doc_type )
|
||||
LOCAL_DEBUG_OUT( "Glossary has %ld items", Glossary->items_num);
|
||||
if( (doc_type == DocType_HTML || doc_type == DocType_PHP ) && Glossary->items_num > 0 )
|
||||
{
|
||||
- ASHashableValue *values;
|
||||
+ ASHashableValueBase *values;
|
||||
ASHashData *data;
|
||||
int items_num, col_length, i ;
|
||||
int col_end[3], col_curr[3], col_count = 3 ;
|
||||
@@ -891,7 +891,7 @@ gen_glossary( const char *dest_dir, const char *file, ASDocType doc_type )
|
||||
return ;
|
||||
|
||||
LOCAL_DEBUG_OUT( "sorting hash items : ... %s", "" );
|
||||
- values = safecalloc( Glossary->items_num, sizeof(ASHashableValue));
|
||||
+ values = safecalloc( Glossary->items_num, sizeof(ASHashableValueBase));
|
||||
data = safecalloc( Glossary->items_num, sizeof(ASHashData));
|
||||
items_num = sort_hash_items (Glossary, values, (void**)data, 0);
|
||||
|
||||
@@ -957,7 +957,7 @@ gen_index( const char *dest_dir, const char *file, ASDocType doc_type, Bool user
|
||||
ASXMLInterpreterState state;
|
||||
if( (doc_type == DocType_HTML || doc_type == DocType_PHP ) && Index->items_num > 0 )
|
||||
{
|
||||
- ASHashableValue *values;
|
||||
+ ASHashableValueBase *values;
|
||||
ASHashData *data;
|
||||
int items_num, i ;
|
||||
Bool sublist = False ;
|
||||
@@ -966,7 +966,7 @@ gen_index( const char *dest_dir, const char *file, ASDocType doc_type, Bool user
|
||||
if( !start_doc_file( dest_dir, file, NULL, doc_type, NULL, NULL, NULL, &state, DOC_CLASS_None, DocClass_TopicIndex ) )
|
||||
return ;
|
||||
LOCAL_DEBUG_OUT( "sorting hash items : ... %s", "" );
|
||||
- values = safecalloc( Index->items_num, sizeof(ASHashableValue));
|
||||
+ values = safecalloc( Index->items_num, sizeof(ASHashableValueBase));
|
||||
data = safecalloc( Index->items_num, sizeof(ASHashData));
|
||||
items_num = sort_hash_items (Index, values, (void**)data, 0);
|
||||
|
||||
diff --git a/src/ASMount/main.c b/src/ASMount/main.c
|
||||
index 9a42b49..ae22ad5 100644
|
||||
--- a/src/ASMount/main.c
|
||||
+++ b/src/ASMount/main.c
|
||||
@@ -1238,7 +1238,9 @@ void init_ASMount(ASFlagType flags, const char *cmd)
|
||||
reloadButtons();
|
||||
AppState.volumes = create_asbidirlist (ASVolume_destroy);
|
||||
|
||||
+#ifndef GLIB_VERSION_2_36
|
||||
g_type_init();
|
||||
+#endif
|
||||
GVolumeMonitor * monitor = g_volume_monitor_get();
|
||||
|
||||
g_signal_connect_object (monitor, "mount-added", G_CALLBACK (mount_added), NULL, 0);
|
||||
@@ -1477,7 +1479,9 @@ main (int argc, char *argv[])
|
||||
LinkAfterStepConfig();
|
||||
InitSession();
|
||||
|
||||
+#ifndef GLIB_VERSION_2_36
|
||||
g_type_init();
|
||||
+#endif
|
||||
#if 0
|
||||
ConnectXDisplay (gdk_x11_display_get_xdisplay(gdk_display_open(NULL)), NULL, False);
|
||||
#else
|
||||
diff --git a/src/afterstep/cover.c b/src/afterstep/cover.c
|
||||
index 5455c48..11a76a4 100644
|
||||
--- a/src/afterstep/cover.c
|
||||
+++ b/src/afterstep/cover.c
|
||||
@@ -101,7 +101,7 @@ void do_anim_shape_blocks (void *vdata)
|
||||
#ifdef SHAPE
|
||||
struct ASDeskAniBlocks *data = (struct ASDeskAniBlocks *)vdata;
|
||||
XRectangle main_b = { 0, 0, Scr.MyDisplayWidth, Scr.MyDisplayHeight };
|
||||
- int ratio = MAX_MY_RND32 / LEVELS_NUM;
|
||||
+ const unsigned int ratio = MAX_MY_RND32 / LEVELS_NUM;
|
||||
int x_dim = Scr.MyDisplayWidth / BLOCKS_NUM;
|
||||
int y_dim = Scr.MyDisplayHeight / data->steps;
|
||||
int level, th;
|
||||
@@ -118,6 +118,9 @@ void do_anim_shape_blocks (void *vdata)
|
||||
int blocks_used;
|
||||
int i = 0;
|
||||
|
||||
+ // note: ratio needs to be unsigned, so that th is promoted to unsigned as well, otherwise gcc-4.8 compains that
|
||||
+ // cover.c:121:6: warning: iteration 5u invokes undefined behavior [-Waggressive-loop-optimizations]
|
||||
+ // and makes the whole while loop infinite...
|
||||
th -= ratio;
|
||||
if (data->off_y[level] < 0)
|
||||
continue;
|
||||
diff --git a/src/afterstep/dbus.c b/src/afterstep/dbus.c
|
||||
index d7594d9..d311094 100644
|
||||
--- a/src/afterstep/dbus.c
|
||||
+++ b/src/afterstep/dbus.c
|
||||
@@ -240,11 +240,13 @@ Bool get_gnome_autosave ()
|
||||
{
|
||||
Bool autosave = False;
|
||||
#ifdef HAVE_GIOLIB
|
||||
+#ifndef GLIB_VERSION_2_36
|
||||
static Bool g_types_inited = False;
|
||||
if (!g_types_inited) {
|
||||
g_type_init();
|
||||
g_types_inited = True;
|
||||
}
|
||||
+#endif
|
||||
if (ASDBus.gnomeSessionPath) {
|
||||
#if defined(HAVE_GSETTINGS)
|
||||
GSettings *gsm_settings = g_settings_new (GSM_MANAGER_SCHEMA);
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
From: Robert Luberda <robert@debian.org>
|
||||
Date: Sat, 25 Oct 2014 16:59:17 +0200
|
||||
Subject: 43 Fix gcc warning
|
||||
|
||||
Fix "undefined behaviour" warning
|
||||
---
|
||||
libAfterConf/Database.c | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/libAfterConf/Database.c b/libAfterConf/Database.c
|
||||
index c10df0d..1cfc7f9 100644
|
||||
--- a/libAfterConf/Database.c
|
||||
+++ b/libAfterConf/Database.c
|
||||
@@ -578,7 +578,8 @@ void delete_name_list (name_list ** head)
|
||||
style_delete (*head, head);
|
||||
}
|
||||
|
||||
-static unsigned long window_style_cross[][2] =
|
||||
+#define WINDOW_STYLE_CROSS_STYLES 4
|
||||
+static unsigned long window_style_cross[WINDOW_STYLE_CROSS_STYLES][2] =
|
||||
{ {DATABASE_FocusStyle_ID, BACK_FOCUSED},
|
||||
{DATABASE_UnfocusStyle_ID, BACK_UNFOCUSED},
|
||||
{DATABASE_StickyStyle_ID, BACK_STICKY},
|
||||
@@ -631,7 +632,7 @@ void ParseSingleStyle (FreeStorageElem * storage, name_list * style)
|
||||
case DATABASE_FocusStyle_ID:
|
||||
case DATABASE_UnfocusStyle_ID:
|
||||
case DATABASE_StickyStyle_ID:
|
||||
- for (i = 0; i < BACK_STYLES; i++)
|
||||
+ for (i = 0; i < WINDOW_STYLE_CROSS_STYLES; i++)
|
||||
if (window_style_cross[i][0] == storage->term->id) {
|
||||
char **s = &(style->window_styles[window_style_cross[i][1]]);
|
||||
|
||||
|
|
@ -1,227 +0,0 @@
|
|||
From: Robert Luberda <robert@debian.org>
|
||||
Date: Sun, 22 Mar 2015 16:35:31 +0100
|
||||
Subject: 44 Fix build with gcc 5
|
||||
|
||||
Remove `inline' keywords from header files, and fix implicit
|
||||
declaration warnings to make the code compile with gcc 5, which
|
||||
have the c99 standard enabled by default.
|
||||
|
||||
Bug-Debian: https://bugs.debian.org/777768
|
||||
---
|
||||
libAfterBase/asvector.h | 2 +-
|
||||
libAfterBase/output.h | 2 +-
|
||||
libAfterBase/parse.h | 2 +-
|
||||
libAfterConf/Feel.c | 2 ++
|
||||
libAfterStep/colorscheme.c | 2 +-
|
||||
libAfterStep/event.c | 2 +-
|
||||
libAfterStep/functions.h | 2 +-
|
||||
libAfterStep/mylook.h | 8 ++++----
|
||||
libAfterStep/session.h | 2 +-
|
||||
src/WinList2/WinList.c | 2 +-
|
||||
src/afterstep/asinternals.h | 9 +++++++--
|
||||
src/afterstep/events.c | 1 +
|
||||
src/afterstep/menuitem.c | 2 ++
|
||||
13 files changed, 24 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/libAfterBase/asvector.h b/libAfterBase/asvector.h
|
||||
index 242bbb8..ec83231 100644
|
||||
--- a/libAfterBase/asvector.h
|
||||
+++ b/libAfterBase/asvector.h
|
||||
@@ -38,7 +38,7 @@ ASVector *append_vector( ASVector *v, void * data, size_t size );
|
||||
/* returns index on success, -1 on failure */
|
||||
int vector_insert_elem( ASVector *v, void *data, size_t size, void *sibling, int before );
|
||||
int vector_relocate_elem (ASVector *v, unsigned int index, unsigned int new_index);
|
||||
-inline size_t vector_find_data (ASVector *v, void *data );
|
||||
+size_t vector_find_data (ASVector *v, void *data );
|
||||
int vector_find_elem( ASVector *v, void *data );
|
||||
/* returns 1 on success, 0 on failure */
|
||||
int vector_remove_elem( ASVector *v, void *data );
|
||||
diff --git a/libAfterBase/output.h b/libAfterBase/output.h
|
||||
index fd186a7..ef21919 100644
|
||||
--- a/libAfterBase/output.h
|
||||
+++ b/libAfterBase/output.h
|
||||
@@ -56,7 +56,7 @@ Bool show_debug( const char *file, const char *func, int line, const char *msg_f
|
||||
|
||||
|
||||
void nonGNUC_debugout( const char *format, ...);
|
||||
-inline void nonGNUC_debugout_stub( const char *format, ...);
|
||||
+void nonGNUC_debugout_stub( const char *format, ...);
|
||||
/* may be used below in case compilation problems occur.
|
||||
* Please submit a bug report if usage of any of the following generates errors on
|
||||
* your compiler . Thanks!!! */
|
||||
diff --git a/libAfterBase/parse.h b/libAfterBase/parse.h
|
||||
index 193fbba..e4db499 100644
|
||||
--- a/libAfterBase/parse.h
|
||||
+++ b/libAfterBase/parse.h
|
||||
@@ -73,7 +73,7 @@ format_geometry ( int x, int y, unsigned int width, unsigned int height, int fla
|
||||
|
||||
double parse_math(const char* str, char** endptr, double size);
|
||||
|
||||
-inline int unsigned_int2buffer_end (char *buffer, int buffer_size, unsigned int val);
|
||||
+int unsigned_int2buffer_end (char *buffer, int buffer_size, unsigned int val);
|
||||
char *string_from_int (int param);
|
||||
char *hex_to_buffer_reverse(void *data, size_t bytes, char* buffer);
|
||||
char *hex_to_buffer(void *data, size_t bytes, char* buffer);
|
||||
diff --git a/libAfterConf/Feel.c b/libAfterConf/Feel.c
|
||||
index 0f2224b..787964d 100644
|
||||
--- a/libAfterConf/Feel.c
|
||||
+++ b/libAfterConf/Feel.c
|
||||
@@ -29,6 +29,8 @@
|
||||
|
||||
#include "afterconf.h"
|
||||
|
||||
+#include <X11/XKBlib.h>
|
||||
+
|
||||
|
||||
flag_options_xref WindowBoxFlagsXref[] = {
|
||||
{ASA_Virtual, WINDOWBOX_Virtual_ID, 0}
|
||||
diff --git a/libAfterStep/colorscheme.c b/libAfterStep/colorscheme.c
|
||||
index 6cdeb56..5b93107 100644
|
||||
--- a/libAfterStep/colorscheme.c
|
||||
+++ b/libAfterStep/colorscheme.c
|
||||
@@ -162,7 +162,7 @@ static inline ARGB32 MAKE_ARGB32_SHADE100 (CARD32 a, int s100)
|
||||
return MAKE_ARGB32_GREY8 (a, s8);
|
||||
}
|
||||
|
||||
-inline void
|
||||
+static inline void
|
||||
make_mono_grad_argb (ARGB32 * grad, ARGB32 base_alpha16, int shade100,
|
||||
int *val_ret)
|
||||
{
|
||||
diff --git a/libAfterStep/event.c b/libAfterStep/event.c
|
||||
index a27759b..8c7a449 100644
|
||||
--- a/libAfterStep/event.c
|
||||
+++ b/libAfterStep/event.c
|
||||
@@ -202,7 +202,7 @@ void sync_event_queue (Bool forget)
|
||||
/****************************************************************************
|
||||
* Records the time of the last processed event. Used in XSetInputFocus
|
||||
****************************************************************************/
|
||||
-inline Time stash_event_time (XEvent * xevent)
|
||||
+static inline Time stash_event_time (XEvent * xevent)
|
||||
{
|
||||
if (xevent->type < LASTEvent) {
|
||||
register Time *ptime =
|
||||
diff --git a/libAfterStep/functions.h b/libAfterStep/functions.h
|
||||
index fb565f1..a50f4e3 100644
|
||||
--- a/libAfterStep/functions.h
|
||||
+++ b/libAfterStep/functions.h
|
||||
@@ -314,7 +314,7 @@ FunctionCode change_func_code (const char *func_name, FunctionCode new_code);
|
||||
void init_func_data (FunctionData * data);
|
||||
void copy_func_data (FunctionData * dst, FunctionData * src);
|
||||
void dup_func_data (FunctionData * dst, FunctionData * src);
|
||||
-inline FunctionData *create_named_function( int func, char *name);
|
||||
+FunctionData *create_named_function( int func, char *name);
|
||||
void set_func_val (FunctionData * data, int arg, int value);
|
||||
int free_func_data (FunctionData * data);
|
||||
void destroy_func_data( FunctionData **pdata );
|
||||
diff --git a/libAfterStep/mylook.h b/libAfterStep/mylook.h
|
||||
index 7bff0b8..a002aa8 100644
|
||||
--- a/libAfterStep/mylook.h
|
||||
+++ b/libAfterStep/mylook.h
|
||||
@@ -397,7 +397,7 @@ void myback_delete( MyBackground **myback, ASImageManager *imman );
|
||||
MyDesktopConfig *create_mydeskconfig( int desk, char *data );
|
||||
void init_deskconfigs_list( MyLook *look );
|
||||
void mydeskconfig_delete( MyDesktopConfig **dc );
|
||||
-inline MyDesktopConfig *add_deskconfig_to_list( ASHashTable *list, MyDesktopConfig *dc );
|
||||
+MyDesktopConfig *add_deskconfig_to_list( ASHashTable *list, MyDesktopConfig *dc );
|
||||
MyDesktopConfig *add_deskconfig( MyLook *look, MyDesktopConfig *dc );
|
||||
|
||||
ARGB32 get_random_tint_color();
|
||||
@@ -411,9 +411,9 @@ void mylook_set_font_size_var (MyLook * look);
|
||||
|
||||
|
||||
struct MyStyle *mylook_get_style(MyLook *look, const char *name);
|
||||
-inline MyBackground *mylook_get_desk_back(MyLook *look, long desk);
|
||||
-inline MyBackground *mylook_get_back(MyLook *look, char *name);
|
||||
-inline MyDesktopConfig *mylook_get_desk_config(MyLook *look, long desk);
|
||||
+MyBackground *mylook_get_desk_back(MyLook *look, long desk);
|
||||
+MyBackground *mylook_get_back(MyLook *look, char *name);
|
||||
+MyDesktopConfig *mylook_get_desk_config(MyLook *look, long desk);
|
||||
|
||||
|
||||
|
||||
diff --git a/libAfterStep/session.h b/libAfterStep/session.h
|
||||
index 536e225..73945d8 100644
|
||||
--- a/libAfterStep/session.h
|
||||
+++ b/libAfterStep/session.h
|
||||
@@ -49,7 +49,7 @@ void destroy_assession (ASSession * session);
|
||||
void update_default_session ( ASSession *session, int func);
|
||||
|
||||
void set_session_override(ASSession * session, const char *overriding_file, int function );
|
||||
-inline const char *get_session_override(ASSession * session, int function );
|
||||
+const char *get_session_override(ASSession * session, int function );
|
||||
|
||||
void change_default_session (ASSession * session, const char *new_val, int function);
|
||||
void change_desk_session (ASSession * session, int desk, const char *new_val, int function);
|
||||
diff --git a/src/WinList2/WinList.c b/src/WinList2/WinList.c
|
||||
index 6db35ac..6c98f38 100644
|
||||
--- a/src/WinList2/WinList.c
|
||||
+++ b/src/WinList2/WinList.c
|
||||
@@ -976,7 +976,7 @@ moveresize_main_canvas( int width, int height )
|
||||
void
|
||||
postponed_rearrange_winlist( void *vdata )
|
||||
{
|
||||
- Bool dont_resize_main_canvas = (Bool)vdata ;
|
||||
+ Bool dont_resize_main_canvas = vdata != NULL;
|
||||
rearrange_winlist_window( dont_resize_main_canvas );
|
||||
}
|
||||
|
||||
diff --git a/src/afterstep/asinternals.h b/src/afterstep/asinternals.h
|
||||
index 81b3249..9f75fd8 100644
|
||||
--- a/src/afterstep/asinternals.h
|
||||
+++ b/src/afterstep/asinternals.h
|
||||
@@ -575,6 +575,7 @@ void asdbus_shutdown();
|
||||
void asdbus_process_messages ();
|
||||
|
||||
char *asdbus_RegisterSMClient(const char *sm_client_id);
|
||||
+void asdbus_UnregisterSMClient (const char *sm_client_path);
|
||||
void asdbus_Notify(const char *summary, const char *body, int timeout);
|
||||
|
||||
typedef enum {
|
||||
@@ -585,6 +586,10 @@ typedef enum {
|
||||
|
||||
Bool asdbus_GetCanLogout ();
|
||||
Bool asdbus_Logout (ASDbusLogoutMode mode, int timeout);
|
||||
+Bool asdbus_GetCanSuspend ();
|
||||
+Bool asdbus_Suspend (int timeout);
|
||||
+Bool asdbus_GetCanHibernate ();
|
||||
+Bool asdbus_Hibernate (int timeout);
|
||||
Bool asdbus_GetCanShutdown ();
|
||||
Bool asdbus_Shutdown (int timeout);
|
||||
Bool get_gnome_autosave ();
|
||||
@@ -689,8 +694,8 @@ void ParsePopupEntry (char *tline, FILE * fd, char **junk, int *junk2);
|
||||
|
||||
|
||||
/*************************** misc.c *********************************/
|
||||
-inline void ungrab_window_buttons( Window w );
|
||||
-inline void ungrab_window_keys (Window w );
|
||||
+void ungrab_window_buttons( Window w );
|
||||
+void ungrab_window_keys (Window w );
|
||||
void MyXGrabButton ( unsigned button, unsigned modifiers,
|
||||
Window grab_window, Bool owner_events, unsigned event_mask,
|
||||
int pointer_mode, int keyboard_mode, Window confine_to, Cursor cursor);
|
||||
diff --git a/src/afterstep/events.c b/src/afterstep/events.c
|
||||
index 5588ffb..19e5441 100644
|
||||
--- a/src/afterstep/events.c
|
||||
+++ b/src/afterstep/events.c
|
||||
@@ -46,6 +46,7 @@
|
||||
#include "../../libAfterStep/moveresize.h"
|
||||
|
||||
#include <X11/keysym.h>
|
||||
+#include <X11/XKBlib.h>
|
||||
#ifdef XSHMIMAGE
|
||||
# include <sys/ipc.h>
|
||||
# include <sys/shm.h>
|
||||
diff --git a/src/afterstep/menuitem.c b/src/afterstep/menuitem.c
|
||||
index 1adcb65..8a35186 100644
|
||||
--- a/src/afterstep/menuitem.c
|
||||
+++ b/src/afterstep/menuitem.c
|
||||
@@ -55,6 +55,8 @@
|
||||
|
||||
#include "dirtree.h"
|
||||
|
||||
+#include <X11/XKBlib.h>
|
||||
+
|
||||
/***************************************************************************/
|
||||
/* Menu functions */
|
||||
/***************************************************************************/
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
From: Robert Luberda <robert@debian.org>
|
||||
Date: Sun, 22 Mar 2015 18:44:58 +0100
|
||||
Subject: 45 Fix libAfterBase Makefile
|
||||
|
||||
Do not try to install afterimage-libs afterimage-config
|
||||
in libAfterBase Makefile, those two scripts are installed
|
||||
by libAfterImage.
|
||||
---
|
||||
libAfterBase/Makefile.in | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/libAfterBase/Makefile.in b/libAfterBase/Makefile.in
|
||||
index 41f53c6..3dc63b7 100644
|
||||
--- a/libAfterBase/Makefile.in
|
||||
+++ b/libAfterBase/Makefile.in
|
||||
@@ -137,7 +137,6 @@ install.script:
|
||||
install.dyn:
|
||||
@( echo "$(INSTALL_LIB) $(LIB_SHARED).$(LIBVER) $(LIBDIR)"; \
|
||||
$(INSTALL_LIB) $(LIB_SHARED).$(LIBVER) $(LIBDIR); \
|
||||
- $(INSTALL_SCRIPT) afterimage-libs afterimage-config $(AFTER_BIN_DIR); \
|
||||
$(RM) -f $(LIBDIR)/$(LIB_SHARED).$(LIBVERMAJOR) $(LIBDIR)/$(LIB_SHARED); \
|
||||
$(LN_S) -f $(LIB_SHARED).$(LIBVER) $(LIBDIR)/$(LIB_SHARED).$(LIBVERMAJOR); \
|
||||
$(LN_S) -f $(LIB_SHARED).$(LIBVERMAJOR) $(LIBDIR)/$(LIB_SHARED); \
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
diff --git libAfterBase/configure.in libAfterBase/configure.in
|
||||
index 4bc2232..f250692 100644
|
||||
--- a/libAfterBase/configure.in
|
||||
+++ b/libAfterBase/configure.in
|
||||
@@ -228,12 +228,7 @@ if test "x$enable_xlocale" = "xyes"; then
|
||||
fi
|
||||
|
||||
dnl# Check for safe min/max - there still are some retarded compilers out there :
|
||||
-AC_MSG_CHECKING(if we can use sign safe min/max macros)
|
||||
-AC_TRY_RUN([#define MIN(x,y) \
|
||||
- ({ const typeof(x) _x = (x); const typeof(y) _y = (y); (void) (&_x == &_y); \
|
||||
- _x < _y ? _x : _y; })
|
||||
- int main(){return MIN(0,1);}],
|
||||
- [AC_DEFINE(USE_SAFE_MINMAX,1,will use type-safe min/max macros) AC_MSG_RESULT(yes)],AC_MSG_RESULT(no))
|
||||
+AC_DEFINE(USE_SAFE_MINMAX,1,will use type-safe min/max macros)
|
||||
|
||||
dnl# Translate enable_* from "yes/no" to "1/0" (for configure.h)
|
||||
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
diff --git configure configure
|
||||
index bc9a30e..95e7b3a 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -6254,6 +6254,8 @@ FROM_AFTERSTEP_CONFIGURE=yes
|
||||
export FROM_AFTERSTEP_CONFIGURE
|
||||
|
||||
_def_lib_conf_opts=" \
|
||||
+ --build=${build_alias} \
|
||||
+ --host=${host_alias} \
|
||||
--prefix=${prefix} \
|
||||
--exec-prefix=${exec_prefix} \
|
||||
--bindir=${bindir} \
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
diff --git libAfterImage/configure.in libAfterImage/configure.in
|
||||
index ca49a50..780e0ff 100644
|
||||
--- a/libAfterImage/configure.in
|
||||
+++ b/libAfterImage/configure.in
|
||||
@@ -590,21 +590,21 @@ else
|
||||
)
|
||||
if test "x$have_ft2build" = "xno" ; then
|
||||
if test "x$have_freetype_freetype" = "xyes" ; then
|
||||
- AC_TRY_RUN([#include <freetype/freetype.h>
|
||||
+ AC_TRY_COMPILE([#include <freetype/freetype.h>
|
||||
int main(){FT_Face f; return 0;}],
|
||||
[have_ttf=yes],AC_MSG_RESULT(no))
|
||||
elif test "x$have_freetype" = "xyes" ; then
|
||||
- AC_TRY_RUN([#include <freetype.h>
|
||||
+ AC_TRY_COMPILE([#include <freetype.h>
|
||||
int main(){FT_Face f; return 0;}],
|
||||
[have_ttf=yes],AC_MSG_RESULT(no))
|
||||
fi;
|
||||
elif test "x$have_freetype_freetype" = "xyes" ; then
|
||||
- AC_TRY_RUN([#include <ft2build.h>
|
||||
+ AC_TRY_COMPILE([#include <ft2build.h>
|
||||
#include <freetype/freetype.h>
|
||||
int main(){FT_Face f; return 0;}],
|
||||
[have_ttf=yes],AC_MSG_RESULT(no))
|
||||
elif test "x$have_freetype" = "xyes" ; then
|
||||
- AC_TRY_RUN([#include <ft2build.h>
|
||||
+ AC_TRY_COMPILE([#include <ft2build.h>
|
||||
#include <freetype.h>
|
||||
int main(){FT_Face f; return 0;}],
|
||||
[have_ttf=yes],AC_MSG_RESULT(no))
|
||||
|
|
@ -1,97 +0,0 @@
|
|||
From 5e9e897cf8c455390dd6f5b27fec49707f6b9088 Mon Sep 17 00:00:00 2001
|
||||
From: Sergei Trofimovich <slyich@gmail.com>
|
||||
Date: Sat, 20 Nov 2021 10:07:02 +0000
|
||||
Subject: [PATCH] Makefile.in: drop 'l' from 'ar' (binutils-2.36+ support)
|
||||
|
||||
Before the change build failed as:
|
||||
|
||||
$ make
|
||||
...
|
||||
ar clq libAfterBase.a ashash.o aslist.o asvector.o audit.o fs.o layout.o mystring.o os.o output.o parse.o regexp.o safemalloc.o selfdiag.o sleep.o socket.o timer.o trace.o xml.o xprop.o xwrap.o
|
||||
ar: libdeps specified more than once
|
||||
|
||||
It used to work until binutils-2.36 because 'l' option was silently
|
||||
ignored on binutils-2.35. On 2.36 'l' became 'libdeps' flag with
|
||||
required option:
|
||||
|
||||
https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=f3016d6ce178b76002edde12c30ebe7f608a8e21
|
||||
|
||||
Applied change as:
|
||||
|
||||
$ sed -i 's/ar clq/ar cq/g' */*.in */*/*.in
|
||||
|
||||
Closes: https://github.com/afterstep/afterstep/issues/2
|
||||
Closes: https://github.com/afterstep/afterstep/issues/3
|
||||
---
|
||||
autoconf/Makefile.defines.in | 2 +-
|
||||
libAfterBase/Makefile.in | 2 +-
|
||||
libAfterImage/Makefile.in | 2 +-
|
||||
libAfterImage/aftershow/Makefile.in | 2 +-
|
||||
libAfterImage/apps/Makefile.in | 2 +-
|
||||
5 files changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/autoconf/Makefile.defines.in b/autoconf/Makefile.defines.in
|
||||
index 63e781663..3e1b7ae38 100644
|
||||
--- a/autoconf/Makefile.defines.in
|
||||
+++ b/autoconf/Makefile.defines.in
|
||||
@@ -9,7 +9,7 @@ CCFLAGS = @CFLAGS@
|
||||
EXTRA_DEFINES =
|
||||
|
||||
RANLIB = @RANLIB@
|
||||
-AR = ar clq
|
||||
+AR = ar cq
|
||||
CP = @CP@
|
||||
MV = @MV@
|
||||
RM = @RM@
|
||||
diff --git a/libAfterBase/Makefile.in b/libAfterBase/Makefile.in
|
||||
index e5e91c231..0fb505d47 100644
|
||||
--- a/libAfterBase/Makefile.in
|
||||
+++ b/libAfterBase/Makefile.in
|
||||
@@ -58,7 +58,7 @@ CCFLAGS = @CFLAGS@
|
||||
EXTRA_DEFINES = @DEFINE_XLOCALE@
|
||||
|
||||
RANLIB = @RANLIB@
|
||||
-AR = ar clq
|
||||
+AR = ar cq
|
||||
CP = @CP@
|
||||
MV = @MV@
|
||||
RM = @RM@
|
||||
diff --git a/libAfterImage/Makefile.in b/libAfterImage/Makefile.in
|
||||
index 124b0df88..bb5251776 100644
|
||||
--- a/libAfterImage/Makefile.in
|
||||
+++ b/libAfterImage/Makefile.in
|
||||
@@ -76,7 +76,7 @@ CCFLAGS = @CFLAGS@ @MMX_CFLAGS@
|
||||
EXTRA_DEFINES = @DEFINE_XLOCALE@
|
||||
|
||||
RANLIB = @RANLIB@
|
||||
-AR = ar clq
|
||||
+AR = ar cq
|
||||
CP = @CP@
|
||||
MV = @MV@
|
||||
RM = @RM@
|
||||
diff --git a/libAfterImage/aftershow/Makefile.in b/libAfterImage/aftershow/Makefile.in
|
||||
index b7592923f..7acdcd2eb 100644
|
||||
--- a/libAfterImage/aftershow/Makefile.in
|
||||
+++ b/libAfterImage/aftershow/Makefile.in
|
||||
@@ -11,7 +11,7 @@ CCFLAGS = @CFLAGS@
|
||||
EXTRA_DEFINES = @DEFINE_XLOCALE@
|
||||
|
||||
RANLIB = @RANLIB@
|
||||
-AR = ar clq
|
||||
+AR = ar cq
|
||||
CP = @CP@
|
||||
MV = @MV@
|
||||
RM = @RM@
|
||||
diff --git a/libAfterImage/apps/Makefile.in b/libAfterImage/apps/Makefile.in
|
||||
index 47a64bd5e..ed7cd5afc 100644
|
||||
--- a/libAfterImage/apps/Makefile.in
|
||||
+++ b/libAfterImage/apps/Makefile.in
|
||||
@@ -8,7 +8,7 @@ CCFLAGS = @CFLAGS@
|
||||
EXTRA_DEFINES = @DEFINE_XLOCALE@
|
||||
|
||||
RANLIB = @RANLIB@
|
||||
-AR = ar clq
|
||||
+AR = ar cq
|
||||
CP = @CP@
|
||||
MV = @MV@
|
||||
RM = @RM@
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
# Template file for 'afterstep'
|
||||
pkgname=afterstep
|
||||
version=2.2.12
|
||||
revision=2
|
||||
build_style=gnu-configure
|
||||
configure_args="ac_cv_header_elf_h=no"
|
||||
hostmakedepends="pkg-config automake libtool"
|
||||
makedepends="fltk-devel gtk+-devel"
|
||||
short_desc="Window Manager based on the look and feel of the NeXTStep interface"
|
||||
maintainer="Orphaned <orphan@voidlinux.org>"
|
||||
license="MIT"
|
||||
homepage="http://www.afterstep.org/"
|
||||
distfiles="https://github.com/sashavasko/${pkgname}-devel/archive/${version}.tar.gz"
|
||||
checksum=7a82d06a9ce432ef3b0856ff39f6da416aa8cbc249dbb2ff3c1cdcb02e2ca46d
|
||||
|
||||
pre_configure() {
|
||||
autoreconf -fi libAfterBase
|
||||
autoreconf -fi libAfterImage
|
||||
}
|
||||
|
||||
post_install() {
|
||||
vlicense COPYRIGHT
|
||||
}
|
||||
|
||||
afterstep-devel_package() {
|
||||
short_desc+=" - development files"
|
||||
depends="${sourcepkg}>=${version}_${revision}"
|
||||
pkg_install() {
|
||||
vmove "usr/bin/*-config"
|
||||
vmove "usr/bin/*-libs"
|
||||
vmove usr/include
|
||||
vmove "usr/lib/*.a"
|
||||
vmove usr/share/man/man3
|
||||
}
|
||||
}
|
||||
|
|
@ -24,6 +24,7 @@ replaces="
|
|||
acme-client<=0.1.16_5
|
||||
adobe-flash-plugin-ppapi<=32.0.0.465_1
|
||||
adobe-flash-plugin<=32.0.0.465_1
|
||||
afterstep<=2.2.12_2
|
||||
alarm-clock<=1.4.9_1
|
||||
albert<=0.16.1_4
|
||||
alsa-sndio<=0.2_2
|
||||
|
|
|
|||
Loading…
Reference in New Issue