aboutsummaryrefslogtreecommitdiff
path: root/comms/gammu-devel/files
diff options
context:
space:
mode:
Diffstat (limited to 'comms/gammu-devel/files')
-rw-r--r--comms/gammu-devel/files/extra-patch-CMakeLists.txt39
-rw-r--r--comms/gammu-devel/files/patch-CMakeLists.txt20
-rw-r--r--comms/gammu-devel/files/patch-bluetooth66
-rw-r--r--comms/gammu-devel/files/patch-cfg-Makefile.cfg11
-rw-r--r--comms/gammu-devel/files/patch-cfg-Makefile.glo59
-rw-r--r--comms/gammu-devel/files/patch-common.device.devfunc.c11
-rw-r--r--comms/gammu-devel/files/patch-common.service.gsmmisc.c10
7 files changed, 0 insertions, 216 deletions
diff --git a/comms/gammu-devel/files/extra-patch-CMakeLists.txt b/comms/gammu-devel/files/extra-patch-CMakeLists.txt
deleted file mode 100644
index b16f168e02be..000000000000
--- a/comms/gammu-devel/files/extra-patch-CMakeLists.txt
+++ /dev/null
@@ -1,39 +0,0 @@
---- CMakeLists.txt.orig 2007-08-11 19:35:06.000000000 +0400
-+++ CMakeLists.txt 2007-08-11 19:35:43.000000000 +0400
-@@ -693,36 +693,6 @@
- )
-
- install (
-- FILES ${DOCS}
-- DESTINATION "${INSTALL_DOC_DIR}"
-- COMPONENT "basic-documentation"
-- )
--
--install (
-- FILES ${SYMBIAN_FILES}
-- DESTINATION "${INSTALL_DOC_DIR}/symbian"
-- COMPONENT "gnapplet"
-- )
--
--foreach (DOC ${DEVELDOCS})
-- string (REGEX REPLACE "docs/develop(.*)/[^/]*$" "\\1" DIRNAME ${DOC})
-- install (
-- FILES ${DOC}
-- DESTINATION "${INSTALL_DOC_DIR}/devel/${DIRNAME}"
-- COMPONENT "developer-documentation"
-- )
--endforeach (DOC)
--
--foreach (EXAMPLE ${EXAMPLES})
-- string (REGEX REPLACE "(docs/examples|other/php)(.*)/[^/]*$" "\\2" DIRNAME ${EXAMPLE})
-- install (
-- FILES ${EXAMPLE}
-- DESTINATION "${INSTALL_DOC_DIR}/examples/${DIRNAME}"
-- COMPONENT "developer-documentation"
-- )
--endforeach (EXAMPLE)
--
--install (
- FILES ${MAN1_PAGES}
- DESTINATION "${INSTALL_MAN_DIR}/man1"
- COMPONENT "basic-documentation"
diff --git a/comms/gammu-devel/files/patch-CMakeLists.txt b/comms/gammu-devel/files/patch-CMakeLists.txt
deleted file mode 100644
index bf9452a684c0..000000000000
--- a/comms/gammu-devel/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
---- CMakeLists.txt.orig 2007-08-08 16:30:55.000000000 +0400
-+++ CMakeLists.txt 2007-08-21 00:18:05.000000000 +0400
-@@ -601,7 +604,7 @@
- set (INSTALL_DOC_DIR "share/doc/gammu" CACHE STRING "Path for documentation installation")
- mark_as_advanced (INSTALL_DOC_DIR)
-
--set (INSTALL_MAN_DIR "share/man" CACHE STRING "Path for man pages installation")
-+set (INSTALL_MAN_DIR "man" CACHE STRING "Path for man pages installation")
- mark_as_advanced (INSTALL_MAN_DIR)
-
- # Generate pkgconfig file
-@@ -662,7 +665,7 @@
-
- install (
- FILES "${Gammu_BINARY_DIR}/cfg/gammu.pc"
-- DESTINATION "${INSTALL_LIB_DIR}/pkgconfig"
-+ DESTINATION "libdata/pkgconfig"
- COMPONENT "development"
- )
-
diff --git a/comms/gammu-devel/files/patch-bluetooth b/comms/gammu-devel/files/patch-bluetooth
deleted file mode 100644
index c7629e4612e7..000000000000
--- a/comms/gammu-devel/files/patch-bluetooth
+++ /dev/null
@@ -1,66 +0,0 @@
---- common/device/bluetoth/bluez.c.orig 2007-03-10 19:47:59.000000000 +0300
-+++ common/device/bluetoth/bluez.c 2007-06-29 20:00:48.000000000 +0400
-@@ -23,6 +23,8 @@
- #ifdef GSM_ENABLE_BLUETOOTHDEVICE
- #ifdef GSM_ENABLE_BLUEZ
-
-+#define BDADDR_ANY NG_HCI_BDADDR_ANY
-+
- #include <stdlib.h>
- #include <stdio.h>
- #include <fcntl.h>
-@@ -31,11 +33,7 @@
- #include <sys/socket.h>
- #include <sys/time.h>
- #include <unistd.h>
--#include <bluetooth/bluetooth.h>
--#include <bluetooth/rfcomm.h>
--#include <bluetooth/sdp.h>
--#include <bluetooth/sdp_lib.h>
--#include <bluetooth/hci_lib.h>
-+#include <bluetooth.h>
-
- #include "../../gsmcomon.h"
- #include "../devfunc.h"
-@@ -44,7 +42,7 @@
- GSM_Error bluetooth_connect(GSM_StateMachine *s, int port, char *device)
- {
- GSM_Device_BlueToothData *d = &s->Device.Data.BlueTooth;
-- struct sockaddr_rc laddr, raddr;
-+ struct sockaddr_rfcomm laddr, raddr;
- bdaddr_t bdaddr;
- int fd;
-
-@@ -53,15 +51,15 @@
-
- smprintf(s, "Connecting to RF channel %i\n",port);
-
-- fd = socket(PF_BLUETOOTH, SOCK_STREAM, BTPROTO_RFCOMM);
-+ fd = socket(PF_BLUETOOTH, SOCK_STREAM, BLUETOOTH_PROTO_RFCOMM);
- if (fd < 0) {
- dbgprintf("Can't create socket\n");
- return ERR_DEVICENODRIVER;
- }
-
-- bacpy(&laddr.rc_bdaddr, BDADDR_ANY);
-- laddr.rc_family = AF_BLUETOOTH;
-- laddr.rc_channel = 0;
-+ bacpy(&laddr.rfcomm_bdaddr, BDADDR_ANY);
-+ laddr.rfcomm_family = AF_BLUETOOTH;
-+ laddr.rfcomm_channel = 0;
-
- if (bind(fd, (struct sockaddr *)&laddr, sizeof(laddr)) < 0) {
- dbgprintf("Can't bind socket\n");
-@@ -70,9 +68,9 @@
- }
-
- str2ba(device, &bdaddr);
-- bacpy(&raddr.rc_bdaddr, &bdaddr);
-- raddr.rc_family = AF_BLUETOOTH;
-- raddr.rc_channel = port;
-+ bacpy(&raddr.rfcomm_bdaddr, &bdaddr);
-+ raddr.rfcomm_family = AF_BLUETOOTH;
-+ raddr.rfcomm_channel = port;
-
- if (connect(fd, (struct sockaddr *)&raddr, sizeof(raddr)) < 0) {
- dbgprintf("Can't connect\n");
diff --git a/comms/gammu-devel/files/patch-cfg-Makefile.cfg b/comms/gammu-devel/files/patch-cfg-Makefile.cfg
deleted file mode 100644
index ecc9b58a83a0..000000000000
--- a/comms/gammu-devel/files/patch-cfg-Makefile.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
---- cfg/Makefile.cfg.orig 2007-08-10 03:03:45.000000000 +0400
-+++ cfg/Makefile.cfg 2007-08-10 03:04:04.000000000 +0400
-@@ -39,7 +39,7 @@
- INSTALL_BIN_DIR = ${exec_prefix}/bin
- INSTALL_DOC_DIR = ${datarootdir}/doc/gammu
- INSTALL_LOC_DIR = ${datarootdir}/locale
--INSTALL_MAN_DIR = ${datarootdir}/man/man1
-+INSTALL_MAN_DIR = ${prefix}/man/man1
- INSTALL_LIB_DIR = ${exec_prefix}/lib
- INSTALL_H_DIR = ${prefix}/include/gammu
- RPM_DIR = /usr/src/rpm
diff --git a/comms/gammu-devel/files/patch-cfg-Makefile.glo b/comms/gammu-devel/files/patch-cfg-Makefile.glo
deleted file mode 100644
index 9f88aa6df417..000000000000
--- a/comms/gammu-devel/files/patch-cfg-Makefile.glo
+++ /dev/null
@@ -1,59 +0,0 @@
---- cfg/Makefile.glo.orig 2007-05-17 14:50:38.000000000 +0400
-+++ cfg/Makefile.glo 2007-06-29 20:15:03.000000000 +0400
-@@ -126,7 +126,7 @@
- # Add special flags for gammu binary
- @$(CC) -c $(CFLAGS) $(CPPFLAGS) $*.c -o $*.o $(if $(subst gammu/gammu.c,,$<),,$(GAMMU_CFLAGS))
-
--all: gammu locales
-+all: gammu locales shared
-
- $(TOPDIR)/gammu/gammu: $(COMMON) $(GAMMU)
- @echo Linking gammu
-@@ -235,6 +235,8 @@
- @$(INSTALL) -m 0644 $(TOPDIR)/README $(DESTDIR)$(INSTALL_DOC_DIR)
- @$(INSTALL) -m 0644 $(TOPDIR)/SUPPORTERS $(DESTDIR)$(INSTALL_DOC_DIR)
- @$(INSTALL) -m 0644 $(TOPDIR)/COPYING $(DESTDIR)$(INSTALL_DOC_DIR)
-+
-+installman:
- @echo Installing man to $(DESTDIR)$(INSTALL_MAN_DIR)
- @$(INSTALL) -m 0755 -d $(DESTDIR)$(INSTALL_MAN_DIR)
- @$(INSTALL) -m 0644 $(TOPDIR)/docs/user/gammu.1 $(DESTDIR)$(INSTALL_MAN_DIR)
-@@ -242,7 +244,7 @@
- @$(RM) $(DESTDIR)$(INSTALL_DOC_DIR)/docs/user/gammu.1
- @$(RM) $(DESTDIR)$(INSTALL_DOC_DIR)/docs/user/gammu-config.1
-
--install: uninstall all installdocs installlocales installonly installutils
-+install: uninstall all installdocs installman installlocales installonly installutils
-
- installutils:
- @echo Installing utilities to $(DESTDIR)$(INSTALL_BIN_DIR)
-@@ -255,7 +257,7 @@
- @$(INSTALL) -m 0755 $(TOPDIR)/gammu/gammu $(DESTDIR)$(INSTALL_BIN_DIR)
-
- installshared: installlib
--installlib: uninstall makelib installdocs installlocales installlibonly
-+installlib: uninstall makelib installman installdocs installlocales installlibonly
-
- installlibonly: shared
- @echo Installing binaries to $(DESTDIR)$(INSTALL_BIN_DIR)
-@@ -264,8 +266,7 @@
-
- @echo Installing shared library to $(DESTDIR)$(INSTALL_LIB_DIR)
- @$(INSTALL) -m 0755 -d $(DESTDIR)$(INSTALL_LIB_DIR)
-- @$(INSTALL) -m 0755 $(TOPDIR)/common/$(LIBGAMMU_FULLNAME) $(DESTDIR)$(INSTALL_LIB_DIR)
-- @$(LN) -s $(LIBGAMMU_FULLNAME) $(DESTDIR)$(INSTALL_LIB_DIR)/$(LIBGAMMU_MJR_NAME)
-+ @$(INSTALL) -m 0755 $(TOPDIR)/common/$(LIBGAMMU_FULLNAME) $(DESTDIR)$(INSTALL_LIB_DIR)/libGammu.so.$(SONAME_MAJOR)
- @$(LN) -s $(LIBGAMMU_MJR_NAME) $(DESTDIR)$(INSTALL_LIB_DIR)/$(LIBGAMMU_SHRTNAME)
-
- @echo Installing static library to $(DESTDIR)$(INSTALL_LIB_DIR)
-@@ -284,8 +285,8 @@
- @$(INSTALL) -m 0644 cfg/config.h $(DESTDIR)$(INSTALL_H_DIR)/config.h
-
- @echo Installing pkgconfig file
-- @$(INSTALL) -m 0755 -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
-- @$(INSTALL) -m 0644 cfg/pkgconfig/gammu.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
-+ @$(INSTALL) -m 0755 -d $(prefix)/libdata/pkgconfig
-+ @$(INSTALL) -m 0644 cfg/pkgconfig/gammu.pc $(prefix)/libdata/pkgconfig
-
- apidoc:
- @if test -z "$(DOXYGEN)" ; then \
diff --git a/comms/gammu-devel/files/patch-common.device.devfunc.c b/comms/gammu-devel/files/patch-common.device.devfunc.c
deleted file mode 100644
index 6dea7c02c241..000000000000
--- a/comms/gammu-devel/files/patch-common.device.devfunc.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- common/device/devfunc.c.orig Fri Feb 23 23:50:01 2007
-+++ common/device/devfunc.c Tue Apr 10 23:46:39 2007
-@@ -18,6 +18,8 @@
-
- #include <string.h>
- #include <fcntl.h>
-+#include <sys/stat.h>
-+#include <sys/socket.h>
- #ifdef WIN32
- # include <io.h>
- #else
diff --git a/comms/gammu-devel/files/patch-common.service.gsmmisc.c b/comms/gammu-devel/files/patch-common.service.gsmmisc.c
deleted file mode 100644
index 4fd010de5d40..000000000000
--- a/comms/gammu-devel/files/patch-common.service.gsmmisc.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- common/service/gsmmisc.c.orig Fri Dec 30 18:18:47 2005
-+++ common/service/gsmmisc.c Fri Dec 30 18:19:07 2005
-@@ -3,6 +3,7 @@
- #include <string.h>
- #include <stdlib.h>
- #include <sys/stat.h>
-+#include <sys/socket.h>
- #ifdef WIN32
- # include <io.h>
- # include <fcntl.h>