[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gsrc-commit] trunk r9314: some minor adjust
|
From: |
Carl Hansen |
|
Subject: |
[Gsrc-commit] trunk r9314: some minor adjust |
|
Date: |
Thu, 8 Jun 2023 02:09:14 -0400 (EDT) |
|
User-agent: |
Bazaar (2.7.0dev1) |
------------------------------------------------------------
revno: 9314
revision-id: carlhansen1234@gmail.com-20230608060908-7dfc1em0ik47ggdw
parent: carlhansen1234@gmail.com-20230608060620-5vigaf1q53inxhyk
committer: carlhansen1234@gmail.com
branch nick: trunk
timestamp: Wed 2023-06-07 23:09:08 -0700
message:
some minor adjust
removed:
pkg/gnu/xnee/files/ files-20211008062007-93f74i82u5g1omep-1
pkg/gnu/xnee/files/enum-decl.patch
enumdecl.patch-20211008062007-93f74i82u5g1omep-2
modified:
pkg/gnu/cpio/Makefile* makefile-20160617014725-uokjfnggs70iry9h-535
pkg/gnu/gengen/Makefile makefile-20160617014725-uokjfnggs70iry9h-702
pkg/gnu/xnee/Makefile makefile-20160617014725-uokjfnggs70iry9h-2029
pkg/gnu/xnee/config.mk config.mk-20160617021520-1tm6vgo1cy7mcx9g-1
pkg/other/openexr/Makefile makefile-20210129010117-rh0ew2ssml9csa8z-2
=== modified file 'pkg/gnu/cpio/Makefile' (properties changed: -x to +x)
=== modified file 'pkg/gnu/gengen/Makefile'
--- a/pkg/gnu/gengen/Makefile 2016-06-17 19:08:15 +0000
+++ b/pkg/gnu/gengen/Makefile 2023-06-08 06:09:08 +0000
@@ -42,6 +42,6 @@
######################################################################
-include ../../../gar/gar.lib/auto.mk
+include ../../../gar/gar.lib/autotools.mk
include ../../../gar/gar.lib/info.mk
include config.mk
=== modified file 'pkg/gnu/xnee/Makefile'
--- a/pkg/gnu/xnee/Makefile 2021-10-08 06:21:07 +0000
+++ b/pkg/gnu/xnee/Makefile 2023-06-08 06:09:08 +0000
@@ -33,17 +33,18 @@
DISTFILES = $(DISTNAME).tar.gz
SIGFILES = $(DISTNAME).tar.gz.sig
-PATCHFILES = enum-decl.patch
-PATCHOPTS = -p0
+#PATCHFILES = enum-decl.patch
+#PATCHOPTS = -p0
BUILDDEPS =
LIBDEPS =
-INSTALL_TARGET = install install-info
+#INSTALL_TARGET = install install-info
+WORKOBJ = $(WORKSRC)
######################################################################
-include ../../../gar/gar.lib/auto.mk
+include ../../../gar/gar.lib/autotools.mk
include ../../../gar/gar.lib/info.mk
include config.mk
=== modified file 'pkg/gnu/xnee/config.mk'
--- a/pkg/gnu/xnee/config.mk 2021-09-28 04:24:58 +0000
+++ b/pkg/gnu/xnee/config.mk 2023-06-08 06:09:08 +0000
@@ -1,5 +1,6 @@
## Configuration options for xnee ##
-CONFIGURE_OPTS ?= --disable-gnome-applet --enable-gui --enable-doc
--enable-xinput2
+CONFIGURE_OPTS ?=
+#CONFIGURE_OPTS ?= --disable-gnome-applet --enable-gui --enable-doc
--enable-xinput2
BUILD_OPTS ?=
#CFLAGS=-I..
=== removed directory 'pkg/gnu/xnee/files'
=== removed file 'pkg/gnu/xnee/files/enum-decl.patch'
--- a/pkg/gnu/xnee/files/enum-decl.patch 2021-10-08 06:21:07 +0000
+++ b/pkg/gnu/xnee/files/enum-decl.patch 1970-01-01 00:00:00 +0000
@@ -1,218 +0,0 @@
-# from
-# https://lists.gnu.org/archive/html/bug-xnee/2020-07/msg00000.html
-#Description: Do not unintentionally declare enum variables.
-#Forwarded: no
-#Author: Peter Pentchev <roam@ringlet.net>
-#Last-Update: 2020-07-23
-
---- cnee/src/cnee_demo.c
-+++ cnee/src/cnee_demo.c
-@@ -33,11 +33,11 @@
- #include "libxnee/xnee_xinput.h"
-
- #include "parse.h"
-+#include "cnee.h"
- #include "cnee_strings.h"
-
-
- #define CNEE_DEMO_DELAYED_START 3
--xnee_option_t *cnee_options ;
-
- static char *
- cnee_get_default_filename()
---- cnee/test/src/xgetter.c
-+++ cnee/test/src/xgetter.c
-@@ -5,14 +5,14 @@
- #include <X11/Xlib.h>
-
-
--enum
-+enum xy_mask
- {
- X = 0,
- Y = 2,
- ALL = 4,
- ROOT= 8,
- WIN = 16
--} xy_mask;
-+} ;
-
- int xg_check( char *arg, char *long_arg , char *short_arg )
- {
---- libxnee/include/libxnee/xnee.h
-+++ libxnee/include/libxnee/xnee.h
-@@ -102,7 +102,7 @@
- XNEE_REPLAY_BACKEND_FAILURE ,
- XNEE_OVERRIDE_DISPLAY_FAILURE ,
- XNEE_LAST_ERROR
-- } _return_values;
-+ } ;
-
-
-
-@@ -112,7 +112,7 @@
- XNEE_BOOL_IMPLICIT_TRUE,
- XNEE_BOOL_EXPLICIT_TRUE,
- XNEE_BOOL_ERROR
-- } _bool_string_values;
-+ } ;
-
- enum xnee_protocol_data_numbers
- {
-@@ -125,14 +125,14 @@
- XNEE_PROTO_XINPUT_EVENT_MASTER,
- XNEE_PROTO_XINPUT_EVENT_SLAVE,
- XNEE_PROTO_LAST
-- } _xnee_protocol_data_numbers;
-+ } ;
-
- enum xnee_replay_backend
- {
- XNEE_REPLAY_XNEE = 0,
- XNEE_REPLAY_SWINPUT,
- XNEE_REPLAY_LAST
-- } _xnee_replay_backend;
-+ } ;
-
- /**
- * \brief simply a X error.
-@@ -228,7 +228,7 @@
- char *data_descr;
- };
-
--enum
-+enum xnee_option_type
- {
- XNEE_ANY_OPTION,
- XNEE_GENERAL_OPTION,
-@@ -240,15 +240,15 @@
- XNEE_INTERNAL_OPTION,
- XNEE_OBSOLETE_OPTION,
- XNEE_RETYPE_OPTION
-- } xnee_option_type;
-+ } ;
-
-
--enum
-+enum xnee_override_display
- {
- XNEE_OVERRIDE_DISPLAY_NONE,
- XNEE_OVERRIDE_DISPLAY_DATA,
- XNEE_OVERRIDE_DISPLAY_CONTROL
-- } xnee_override_display;
-+ } ;
-
- typedef struct
- {
---- libxnee/include/libxnee/xnee_grab.h
-+++ libxnee/include/libxnee/xnee_grab.h
-@@ -46,7 +46,7 @@
- xnee_grab_all_keys (xnee_data* xd);
-
-
--enum
-+enum xnee_grab_modifiers_control
- {
- XNEE_GRAB_NONE_PRESSED=0,
- XNEE_GRAB_NONE_IN_USE,
-@@ -64,7 +64,7 @@
- XNEE_GRAB_KM_PRESS,
- XNEE_GRAB_KM_RELEASE,
- XNEE_GRAB_MOUSE
-- } xnee_grab_modifiers_control ;
-+ } ;
-
- int
- xnee_save_or_print(xnee_data *xd, KeyCode kc, int mode);
---- libxnee/include/libxnee/xnee_internal.h
-+++ libxnee/include/libxnee/xnee_internal.h
-@@ -82,7 +82,7 @@
-
-
- /* ** Do NOT edit ** */
--enum _xnee_data_types {
-+enum xnee_data_types {
- XNEE_EVENT = 0,
- XNEE_REQUEST ,
- XNEE_REPLY ,
-@@ -104,17 +104,17 @@
- XNEE_NEW_WINDOW_DATA,
- XNEE_PREDEF_EVENTS,
- XNEE_NO_DATA
--} xnee_data_types ;
-+} ;
-
- /* ** Do NOT edit ** */
--enum _xnee_mode {
-+enum xnee_mode {
- XNEE_NOMODE = 0,
- XNEE_REPLAYER ,
- XNEE_RECORDER ,
- XNEE_RETYPER ,
- XNEE_DISTRIBUTOR ,
- XNEE_SYNTAX_CHECKER
--} xnee_mode ;
-+} ;
-
-
-
-@@ -206,7 +206,7 @@
- XNEE_RESOLUTION_UNSET = -1,
- XNEE_RESOLUTION_USED = 0,
- XNEE_RESOLUTION_UNUSED = 1
-- } _xnee_resolution_states;
-+ } ;
-
- /*
- * Grab modes/actions
-@@ -222,7 +222,7 @@
- XNEE_GRAB_NODATA = 0,
- XNEE_GRAB_SET = 1,
- XNEE_GRAB_UNKOWN = 15
-- } _xnee_grab_modes;
-+ } ;
-
- /*
- * continue_process commnd enum
-@@ -233,7 +233,7 @@
- XNEE_PROCESS_INC ,
- XNEE_PROCESS_DEC ,
- XNEE_PROCESS_GET
-- } _cont_proc_commands;
-+ } ;
-
- typedef void (*callback_ptr)( XPointer, XRecordInterceptData *);
- typedef callback_ptr *callback_ptrptr;
---- libxnee/include/libxnee/xnee_window.h
-+++ libxnee/include/libxnee/xnee_window.h
-@@ -42,11 +42,11 @@
- } xnee_win_pos;
-
-
--enum
-+enum xnee_window_types
- {
- XNEE_WINDOW_RECEIVED,
- XNEE_WINDOW_SESSION
-- } xnee_window_types;
-+ } ;
-
-
- int
---- pnee/src/callbacks.c
-+++ pnee/src/callbacks.c
-@@ -52,12 +52,12 @@
- gchar *display_string ;
- extern xnee_data *xd ;
-
--enum {
-+enum pnee_files {
- PNEE_FILE_NONE ,
- PNEE_FILE_RECORD ,
- PNEE_FILE_REPLAY ,
- PNEE_FILE_VERBOSE
--} pnee_files;
-+} ;
-
-
- int file_choosen = PNEE_FILE_NONE;
=== modified file 'pkg/other/openexr/Makefile'
--- a/pkg/other/openexr/Makefile 2023-06-04 03:13:52 +0000
+++ b/pkg/other/openexr/Makefile 2023-06-08 06:09:08 +0000
@@ -20,7 +20,7 @@
NAME = OpenEXR
GARNAME = openexr
-GARVERSION = 3.1.8-rc5
+GARVERSION = 3.1.8
HOME_URL = http://www.openexr.com
DESCRIPTION = high dynamic-range (HDR) 2-d image file format
define BLURB
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gsrc-commit] trunk r9314: some minor adjust,
Carl Hansen <=