FreeBSD Bugzilla – Attachment 250837 Details for
Bug 279150
misc/hotkeys: Patch needed due to deprecation of databases/db5
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
git diff against misc/hotkeys
misc_hotkeys03.diff (text/plain), 11.51 KB, created by
Chris Hutchinson
on 2024-05-20 20:45:42 UTC
(
hide
)
Description:
git diff against misc/hotkeys
Filename:
MIME Type:
Creator:
Chris Hutchinson
Created:
2024-05-20 20:45:42 UTC
Size:
11.51 KB
patch
obsolete
>diff --git a/misc/hotkeys/Makefile b/misc/hotkeys/Makefile >index 076262b1b231..e7a9a53677ad 100644 >--- a/misc/hotkeys/Makefile >+++ b/misc/hotkeys/Makefile >@@ -1,13 +1,13 @@ > PORTNAME= hotkeys > PORTVERSION= 0.5.7.1 >-PORTREVISION= 21 >+PORTREVISION= 22 > CATEGORIES= misc > MASTER_SITES= https://BSDforge.com/projects/source/misc/hotkeys/${PORTVERSION}/ > DISTNAME= hotkeys_${PORTVERSION} > > MAINTAINER= portmaster@BSDforge.com >-COMMENT= Allows usage of special keys on internet/multimedia keyboards >-WWW= http://ypwong.org/hotkeys/ >+COMMENT= Permits the use of special keys on internet/multimedia keyboards >+WWW= https://codeberg.org/BSDforge/hotkeys/ > > LICENSE= GPLv2+ > LICENSE_FILE= ${WRKSRC}/COPYING >@@ -17,19 +17,18 @@ LIB_DEPENDS= libharfbuzz.so:print/harfbuzz \ > libxml2.so:textproc/libxml2 \ > libfontconfig.so:x11-fonts/fontconfig > >-USES= bdb gettext-runtime gmake xorg >-USE_GNOME= glib20 pango >+USES= bdb:18 gettext-runtime gmake xorg >+USE_GNOME+= glib20 pango > USE_XORG= x11 xext xft xinerama xkbfile xmu > > GNU_CONFIGURE= yes >-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share > CONFIGURE_ARGS= --with-db3-inc=${BDB_INCLUDE_DIR} \ > --with-db3-lib=${BDB_LIB_DIR} \ > --with-db-name=${BDB_LIB_NAME} > > WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} > >-OPTIONS_DEFINE= OSD >+OPTIONS_DEFINE= OSD > OPTIONS_DEFAULT= OSD > > OSD_LIB_DEPENDS= libxosd.so:misc/xosd >diff --git a/misc/hotkeys/distinfo b/misc/hotkeys/distinfo >index 9cbdcfa6a08b..09d8768fa4e5 100644 >--- a/misc/hotkeys/distinfo >+++ b/misc/hotkeys/distinfo >@@ -1,2 +1,3 @@ >+TIMESTAMP = 1716229475 > SHA256 (hotkeys_0.5.7.1.tar.gz) = 6901bcdb81ca2b6a4ed095b227a2bbca1833fc18d8ed189b7fc803369f1a6faa > SIZE (hotkeys_0.5.7.1.tar.gz) = 234289 >diff --git a/misc/hotkeys/files/patch-configure b/misc/hotkeys/files/patch-configure >index 027faa796e23..1fdfbd81feb9 100644 >--- a/misc/hotkeys/files/patch-configure >+++ b/misc/hotkeys/files/patch-configure >@@ -1,5 +1,5 @@ >---- configure.orig Sun Dec 8 22:34:24 2002 >-+++ configure Fri Mar 2 22:30:45 2007 >+--- configure.orig Sun Mar 19 01:51:24 UTC >++++ configure > @@ -251,6 +251,7 @@ > # Initializations. > # >diff --git a/misc/hotkeys/files/patch-src-Makefile b/misc/hotkeys/files/patch-src-Makefile >index d13b2a8fde78..3e07b14f4e9d 100644 >--- a/misc/hotkeys/files/patch-src-Makefile >+++ b/misc/hotkeys/files/patch-src-Makefile >@@ -1,5 +1,5 @@ >---- src/Makefile.in.orig Sun Dec 8 09:34:44 2002 >-+++ src/Makefile.in Sun May 11 16:18:57 2003 >+--- src/Makefile.in.orig Sun Mar 19 01:51:24 UTC >++++ src/Makefile.in > @@ -96,7 +96,7 @@ > l = @l@ > >diff --git a/misc/hotkeys/files/patch-src-conf.c b/misc/hotkeys/files/patch-src-conf.c >index 4379281343b6..24df251e3c6b 100644 >--- a/misc/hotkeys/files/patch-src-conf.c >+++ b/misc/hotkeys/files/patch-src-conf.c >@@ -1,5 +1,5 @@ >---- src/conf.c.orig Thu Nov 28 03:30:08 2002 >-+++ src/conf.c Fri Mar 2 19:57:12 2007 >+--- src/conf.c.orig Sun Mar 19 01:51:24 UTC >++++ src/conf.c > @@ -31,6 +31,8 @@ > > #include "conf.h" >diff --git a/misc/hotkeys/files/patch-src-hotkeys.c b/misc/hotkeys/files/patch-src-hotkeys.c >index 05e3064faf4f..d346226f367c 100644 >--- a/misc/hotkeys/files/patch-src-hotkeys.c >+++ b/misc/hotkeys/files/patch-src-hotkeys.c >@@ -1,8 +1,6 @@ >-diff --git src/hotkeys.c src/hotkeys.c >-index b3ac52a..9a7cc82 100644 >---- src/hotkeys.c >+--- src/hotkeys.c.orig Sun Mar 19 01:51:24 UTC > +++ src/hotkeys.c >-@@ -54,7 +54,7 @@ extern char *getenv(); >+@@ -54,7 +54,7 @@ > #include <fcntl.h> > #include <sys/ioctl.h> > #if defined (__FreeBSD__) >@@ -11,7 +9,7 @@ index b3ac52a..9a7cc82 100644 > #else > # if defined (__NetBSD__) || defined (__OpenBSD__) > # include <soundcard.h> /* OSS emulation */ >-@@ -66,9 +66,9 @@ extern char *getenv(); >+@@ -66,9 +66,9 @@ > #endif /* __FreeBSD__ */ > > /* CDROM related */ >@@ -23,7 +21,7 @@ index b3ac52a..9a7cc82 100644 > #if HAVE_GTK > #include "splash.h" > #endif >-@@ -585,7 +585,7 @@ adjustVol(int adj) >+@@ -585,7 +585,7 @@ > { > int mixer_fd = -1, cdrom_fd = -1; > int master_vol, cd_vol; >@@ -32,7 +30,7 @@ index b3ac52a..9a7cc82 100644 > int left, right; > static struct timeval last_time; > struct timeval this_time; >-@@ -595,7 +595,7 @@ adjustVol(int adj) >+@@ -595,7 +595,7 @@ > int sign = adj > 0 ? 1 : -1; > > if ( adj == 0 ) >@@ -41,7 +39,7 @@ index b3ac52a..9a7cc82 100644 > > if ( multiplier == 0 ) > { >-@@ -683,6 +683,7 @@ adjustVol(int adj) >+@@ -683,6 +683,7 @@ > } > > /* open the cdrom/dvdrom drive device */ >@@ -49,7 +47,7 @@ index b3ac52a..9a7cc82 100644 > if ( cdromDevice != NULL ) > { > if ( (cdrom_fd = open( cdromDevice, O_RDONLY|O_NONBLOCK )) == -1 ) >-@@ -691,7 +692,7 @@ adjustVol(int adj) >+@@ -691,7 +692,7 @@ > } > else > { >@@ -58,7 +56,7 @@ index b3ac52a..9a7cc82 100644 > if ( ioctl(cdrom_fd, CDROMVOLREAD, &cdrom_vol) == -1 ) > { > uError("Unable to read the CDROM volume of `%s'", cdromDevice); >-@@ -699,7 +700,7 @@ adjustVol(int adj) >+@@ -699,7 +700,7 @@ > } > else > { >@@ -67,7 +65,7 @@ index b3ac52a..9a7cc82 100644 > int t; > float myAdj; > myAdj = 0xFF / 100.0 * adj; >-@@ -721,9 +722,10 @@ adjustVol(int adj) >+@@ -721,9 +722,10 @@ > } > } > } >@@ -79,7 +77,7 @@ index b3ac52a..9a7cc82 100644 > > return ret; > } >-@@ -737,10 +739,10 @@ doMute(void) >+@@ -737,10 +739,10 @@ > { > static Bool muted = False; > static int last_mixer_vol, last_cd_vol; >@@ -92,7 +90,7 @@ index b3ac52a..9a7cc82 100644 > int mixer_fd = -1, cdrom_fd = -1; > > short ret = 0; /* return value */ >-@@ -751,6 +753,7 @@ doMute(void) >+@@ -751,6 +753,7 @@ > uError("Unable to open `%s'", MIXER_DEV); > } > /* open the cdrom/dvdrom drive device */ >@@ -100,7 +98,7 @@ index b3ac52a..9a7cc82 100644 > if ( cdromDevice != NULL ) > { > if ( (cdrom_fd = open( cdromDevice, O_RDONLY|O_NONBLOCK )) == -1 ) >-@@ -758,6 +761,7 @@ doMute(void) >+@@ -758,6 +761,7 @@ > uError("Unable to open `%s'", cdromDevice); > } > } >@@ -108,7 +106,7 @@ index b3ac52a..9a7cc82 100644 > > if ( muted ) > { >-@@ -783,6 +787,7 @@ doMute(void) >+@@ -783,6 +787,7 @@ > #endif > } > } >@@ -116,7 +114,7 @@ index b3ac52a..9a7cc82 100644 > #if 0 > if (SOUND_IOCTL(mixer_fd, SOUND_MIXER_WRITE_CD, &last_cd_vol) == -1) > { >-@@ -800,6 +805,7 @@ doMute(void) >+@@ -800,6 +805,7 @@ > } else > muted = False; > } >@@ -124,7 +122,7 @@ index b3ac52a..9a7cc82 100644 > } > else /* ! muted */ > { >-@@ -837,6 +843,7 @@ doMute(void) >+@@ -837,6 +843,7 @@ > } > } > } >@@ -132,7 +130,7 @@ index b3ac52a..9a7cc82 100644 > #if 0 > if ( SOUND_IOCTL(mixer_fd, SOUND_MIXER_READ_CD, &last_cd_vol) == -1) > { >-@@ -853,7 +860,9 @@ doMute(void) >+@@ -853,7 +860,9 @@ > muted = True; > } > #endif >@@ -142,7 +140,7 @@ index b3ac52a..9a7cc82 100644 > if (cdrom_fd != -1) > { > if ( ioctl(cdrom_fd, CDROMVOLREAD, &last_cdrom_vol) == -1 ) >-@@ -863,8 +872,8 @@ doMute(void) >+@@ -863,8 +872,8 @@ > } > else > { >@@ -153,7 +151,7 @@ index b3ac52a..9a7cc82 100644 > cdrom_vol.channel0 = cdrom_vol.channel1 = cdrom_vol.channel2 = > cdrom_vol.channel3 = 0; > if ( ioctl(cdrom_fd, CDROMVOLCTRL, &cdrom_vol) == -1 ) >-@@ -875,10 +884,11 @@ doMute(void) >+@@ -875,10 +884,11 @@ > muted = True; > } > } >@@ -166,7 +164,7 @@ index b3ac52a..9a7cc82 100644 > > return ret; > } >-@@ -886,19 +896,20 @@ doMute(void) >+@@ -886,19 +896,20 @@ > static int > ejectDisc(void) > { >@@ -191,7 +189,7 @@ index b3ac52a..9a7cc82 100644 > case CDS_TRAY_OPEN: > #ifdef HAVE_LIBXOSD > if ( osd ) >-@@ -929,7 +940,7 @@ ejectDisc(void) >+@@ -929,7 +940,7 @@ > case CDS_NO_INFO: > case CDS_DRIVE_NOT_READY: > default: >@@ -200,7 +198,7 @@ index b3ac52a..9a7cc82 100644 > break; > } > close(fd); >-@@ -940,6 +951,7 @@ ejectDisc(void) >+@@ -940,6 +951,7 @@ > SYSLOG(LOG_NOTICE, "CDROM_DRIVE_STATUS failed: %s\n", strerror(errno)); > return -1; > } >@@ -208,7 +206,7 @@ index b3ac52a..9a7cc82 100644 > } > > >-@@ -1002,8 +1014,8 @@ launchApp(int keycode) >+@@ -1002,8 +1014,8 @@ > #ifdef HAVE_LIBXOSD > if ( osd ) > { >@@ -219,7 +217,7 @@ index b3ac52a..9a7cc82 100644 > } > #endif > } >-@@ -1015,13 +1027,14 @@ launchApp(int keycode) >+@@ -1015,13 +1027,14 @@ > int > sleepState(int mode) > { >@@ -236,7 +234,7 @@ index b3ac52a..9a7cc82 100644 > error = system("apm -S"); > break; > default: >-@@ -1039,10 +1052,10 @@ sleepState(int mode) >+@@ -1039,10 +1052,10 @@ > } > switch (mode) > { >@@ -249,7 +247,7 @@ index b3ac52a..9a7cc82 100644 > error = apm_standby(fd); > break; > default: >-@@ -1050,7 +1063,9 @@ sleepState(int mode) >+@@ -1050,7 +1063,9 @@ > break; > } > apm_close(fd); >@@ -260,7 +258,7 @@ index b3ac52a..9a7cc82 100644 > } > > >-@@ -1105,8 +1120,8 @@ lookupUserCmd(const int keycode) >+@@ -1105,8 +1120,8 @@ > #ifdef HAVE_LIBXOSD > if ( osd ) > { >@@ -271,7 +269,7 @@ index b3ac52a..9a7cc82 100644 > } > #endif > break; /* break the for loop */ >-@@ -1435,15 +1450,16 @@ initXOSD(void) >+@@ -1435,15 +1450,16 @@ > #ifdef HAVE_LIBXOSD > if ( osd ) > { >@@ -297,7 +295,7 @@ index b3ac52a..9a7cc82 100644 > } > #endif > } >-@@ -1592,6 +1608,7 @@ main(int argc, char *argv[]) >+@@ -1592,6 +1608,7 @@ > doMute(); > } else > /* APM stuffs */ >@@ -305,7 +303,7 @@ index b3ac52a..9a7cc82 100644 > if ( ev.message.keycode == (kbd.defCmds)[sleepKey].key || > ev.message.keycode == (kbd.defCmds)[wakeupKey].key ) { > sleepState(STANDBY); >-@@ -1601,14 +1618,15 @@ main(int argc, char *argv[]) >+@@ -1601,14 +1618,15 @@ > } > else > { >diff --git a/misc/hotkeys/files/patch-src-hotkeys.conf b/misc/hotkeys/files/patch-src-hotkeys.conf >index e282c610a63c..c0dc01d38305 100644 >--- a/misc/hotkeys/files/patch-src-hotkeys.conf >+++ b/misc/hotkeys/files/patch-src-hotkeys.conf >@@ -1,5 +1,5 @@ >---- src/hotkeys.conf.orig Fri Nov 22 02:03:35 2002 >-+++ src/hotkeys.conf Mon Mar 5 20:30:28 2007 >+--- src/hotkeys.conf.orig Sun Mar 19 01:51:24 UTC >++++ src/hotkeys.conf > @@ -44,4 +44,9 @@ > # osd_timeout=3 > ### osd_position is either 'top' or 'bottom' >diff --git a/misc/hotkeys/files/patch-src-kbddef.c b/misc/hotkeys/files/patch-src-kbddef.c >index 3f15e132b4d5..5f321824a5be 100644 >--- a/misc/hotkeys/files/patch-src-kbddef.c >+++ b/misc/hotkeys/files/patch-src-kbddef.c >@@ -1,5 +1,5 @@ >---- src/kbddef.c.orig Wed Nov 27 14:51:11 2002 >-+++ src/kbddef.c Sun May 11 16:01:17 2003 >+--- src/kbddef.c.orig Sun Mar 19 01:51:24 UTC >++++ src/kbddef.c > @@ -37,8 +37,8 @@ > */ > #include "XF86keysym.h" >diff --git a/misc/hotkeys/files/patch-src-kbddef.h b/misc/hotkeys/files/patch-src-kbddef.h >index ab78ac86653e..aee479b1e960 100644 >--- a/misc/hotkeys/files/patch-src-kbddef.h >+++ b/misc/hotkeys/files/patch-src-kbddef.h >@@ -1,5 +1,5 @@ >---- src/kbddef.h.orig Mon Mar 19 01:51:24 2001 >-+++ src/kbddef.h Sun May 11 16:01:17 2003 >+--- src/kbddef.h.orig Sun Mar 19 01:51:24 UTC >++++ src/kbddef.h > @@ -55,6 +55,9 @@ > myComputerKey, > favoritesKey,
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=250837">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Flags:
portmaster
:
maintainer-approval+
Actions:
View
|
Diff
Attachments on
bug 279150
:
250824
|
250836
| 250837