rpms/moto4lin/devel moto4lin-0.3-crossplatform.patch, NONE, 1.1 moto4lin.desktop, NONE, 1.1 moto4lin.png, NONE, 1.1 moto4lin.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Sean Reifschneider (jafo)
fedora-extras-commits at redhat.com
Wed Feb 21 05:47:28 UTC 2007
Author: jafo
Update of /cvs/extras/rpms/moto4lin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22112/devel
Modified Files:
.cvsignore sources
Added Files:
moto4lin-0.3-crossplatform.patch moto4lin.desktop moto4lin.png
moto4lin.spec
Log Message:
auto-import moto4lin-0.3-6 on branch devel from moto4lin-0.3-6.src.rpm
moto4lin-0.3-crossplatform.patch:
--- NEW FILE moto4lin-0.3-crossplatform.patch ---
--- moto4lin-0.3/INSTALL 2005-03-02 13:59:54.000000000 -0500
+++ moto4lin-0.3-crossplatform/INSTALL 2006-06-16 13:26:45.000000000 -0400
@@ -3,6 +3,8 @@ To compile you need:
* libusb-devel 0.8 (headers and binary lib)
* g++
+Note: For 64 bit systems you will need lib64usb-devel
+
Installing
========
1. qmake
--- moto4lin-0.3/moto_ui/p2kproc.cpp 2005-03-02 13:49:30.000000000 -0500
+++ moto4lin-0.3-crossplatform/moto_ui/p2kproc.cpp 2006-06-16 12:55:13.000000000 -0400
@@ -17,6 +17,11 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
+
+// Revision History
+// Modified p2kproc.cpp, p2kproc.h, phoneman.cpp to use stdint.h types for cross platform compatibility
+// - James J. Dines - June 17th, 2006 - contact: jdines at entheos-technologies.com
+
#include "p2kproc.h"
#include <time.h>
@@ -92,13 +97,13 @@ P2kProc::P2kProc(QObject * o)
}
-void P2kProc::setATconfig (unsigned int vendor, unsigned int product)
+void P2kProc::setATconfig (uint32_t vendor, uint32_t product)
{
devlst[1].vendor=vendor;
devlst[1].product=product;
}
-void P2kProc::setP2kconfig (unsigned int vendor, unsigned int product)
+void P2kProc::setP2kconfig (uint32_t vendor, uint32_t product)
{
devlst[2].vendor=vendor;
devlst[2].product=product;
@@ -478,8 +483,8 @@ int P2kProc::phGetDevList(devInfo * lst,
usb_dev_handle *udev;
int idx=0;
- unsigned int devVendor;
- unsigned int devProduct;
+ uint32_t devVendor;
+ uint32_t devProduct;
char devManufacturerStr[200];
char devProductStr[200];
int ret;
@@ -815,7 +820,7 @@ int P2kProc::sendControl(int dir, usb_de
}
// Add header and set data to phone via sendControl
-int P2kProc::outData(unsigned char * data, unsigned int size)
+int P2kProc::outData(unsigned char * data, uint32_t size)
{
/*41 02 00 00 08 00 x1 x1 - Setup packet
x2 x2 x3 x3 x4 x4 00 00 - data
@@ -858,7 +863,7 @@ int P2kProc::inpSize(unsigned char * cmd
}
// Get data from phone and perform error handling
-int P2kProc::inpData(unsigned char * data, unsigned int count, unsigned int size)
+int P2kProc::inpData(unsigned char * data, uint32_t count, uint32_t size)
{
FUNC("inpData");
/* ÐÏÌÕÞÅÎÉÅ ÐÁËÅÔÏ× ÏÔ×ÅÔÁ:
--- moto4lin-0.3/moto_ui/p2kproc.h 2005-03-02 12:16:43.000000000 -0500
+++ moto4lin-0.3-crossplatform/moto_ui/p2kproc.h 2006-06-16 12:41:15.000000000 -0400
@@ -17,11 +17,19 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
+
+// Revision History
+// Modified p2kproc.cpp, p2kproc.h, phoneman.cpp to use stdint.h types for cross platform compatibility
+// - James J. Dines - June 17th, 2006 - contact: jdines at entheos-technologies.com
+
#ifndef P2KPROC_H
#define P2KPROC_H
#include <qthread.h>
+// Needed for cross-platform compatibility (e.g. x86_64 vs. x86) - June 17th, 2006 - James J. Dines
+#include <stdint.h>
+
// ========= Default Phone Config ================
// Command to switch phone to P2k Mode
@@ -71,28 +79,28 @@ class QString;
union mWord
{
- unsigned short wordId;
+ uint16_t wordId;
char id[2];
};
union mLong
{
- unsigned long longId;
+ uint32_t longId;
char id[4];
};
typedef struct myDev
{
- unsigned int vendor; // Vendor ID
- unsigned int product; // Product ID
+ uint32_t vendor; // Vendor ID
+ uint32_t product; // Product ID
char name[150]; // Name
}
myDev;
typedef struct
{
- unsigned int vendor;
- unsigned int product;
+ uint32_t vendor;
+ uint32_t product;
char manufacturerStr[256];
char productStr[256];
}
@@ -121,8 +129,8 @@ public:
void phReadSeem(int x, int y, unsigned char * buf, int *size);
void phWriteSeem(int x, int y, unsigned char * buf, int size);
void phBackup(int x1, int y1, int x2, int y2, unsigned char * dir);
- void setATconfig (unsigned int vendor, unsigned int product);
- void setP2kconfig (unsigned int vendor, unsigned int product);
+ void setATconfig (uint32_t vendor, uint32_t product);
+ void setP2kconfig (uint32_t vendor, uint32_t product);
void setDevice(char * cmd);
int phGetDevList(devInfo * lst, int cnt);
void drv_switchP2K(char * st = NULL);
@@ -181,9 +189,9 @@ private:
int sendControl(int dir, usb_dev_handle *dev, int requesttype, int request, int value,
int index, char *bytes, int size, int timeout);
- int outData(unsigned char * data, unsigned int size);
+ int outData(unsigned char * data, uint32_t size);
int inpSize(unsigned char * cmd, int size);
- int inpData(unsigned char * data, unsigned int count, unsigned int size);
+ int inpData(unsigned char * data, uint32_t count, uint32_t size);
void drv_initUsb();
int get_cmd_size(unsigned char * packetCount);
int check_packet_header(unsigned char * buf, int bufsize, int adr, char needdata=1, char checky=1);
--- moto4lin-0.3/moto_ui/phoneman.cpp 2005-03-02 12:15:18.000000000 -0500
+++ moto4lin-0.3-crossplatform/moto_ui/phoneman.cpp 2006-06-16 12:41:04.000000000 -0400
@@ -18,6 +18,10 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
+// Revision History
+// Modified p2kproc.cpp, p2kproc.h, phoneman.cpp to use stdint.h types for cross platform compatibility
+// - James J. Dines - June 17th, 2006 - contact: jdines at entheos-technologies.com
+
#include <qstring.h>
#include <qevent.h>
@@ -43,12 +47,12 @@ PhoneMan::~PhoneMan()
}
-void PhoneMan::setATconfig (unsigned int vendor, unsigned int product)
+void PhoneMan::setATconfig (uint32_t vendor, uint32_t product)
{
proc->setATconfig(vendor,product);
}
-void PhoneMan::setP2kconfig (unsigned int vendor, unsigned int product)
+void PhoneMan::setP2kconfig (uint32_t vendor, uint32_t product)
{
proc->setP2kconfig(vendor,product);
}
--- NEW FILE moto4lin.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=moto4lin
GenericName=Filemanager for Motorola P2k phones
Comment=Upload ringtones and download photos.
Exec=moto4lin
Icon=moto4lin.png
Terminal=false
Type=Application
Categories=Utility;PDA
Version=0.3
--- NEW FILE moto4lin.spec ---
Name: moto4lin
Version: 0.3
Release: 6%{?dist}
License: GPL
Summary: Filemanager and seem editor for Motorola P2k phones
Group: Applications/Communications
URL: http://moto4lin.sourceforge.net/wiki/Main_Page
Source: http://easynews.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
Source1: %{name}.desktop
Source2: %{name}.png
Patch1: %{name}-0.3-crossplatform.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: qt-devel, desktop-file-utils, libusb-devel
%description
This software is Filemanager and seem editor for Motorola P2k phones
(like C380/C650).
%prep
%setup -q
%patch1 -p1 -b crossplatform
qmake
%build
make CXX="g++ $RPM_OPT_FLAGS" %{_smp_mflags} all
%install
rm -rf %{buildroot}
make install INSTALL_ROOT=%{buildroot}
%{__install} -p -D %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/%{name}.png
desktop-file-install --vendor="fedora" \
--dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
%clean
rm -rf %{buildroot}
%files
%doc README Changelog GPL-2
%defattr(-,root,root)
%{_bindir}/moto4lin
%{_datadir}/pixmaps/*
%{_datadir}/applications/*
%changelog
* Tue Feb 13 2007 Sean Reifschneider <jafo at tummy.com> 0.3-6
- Including fix from Mamoru Tasaka to use compiler flags when builing.
* Sun Feb 11 2007 Sean Reifschneider <jafo at tummy.com> 0.3-5
- More suggestions from Manuel for the Fedora packaging. Fixing
inconsistent build_root usage, Fixing desktop category, changing group.
* Mon Feb 05 2007 Sean Reifschneider <jafo at tummy.com> 0.3-4
- More suggestions from Manuel for the Fedora packaging. Fixing patch in
spec file, removing lib64usb build dependency, changing .desktop file
categories.
* Sun Feb 04 2007 Sean Reifschneider <jafo at tummy.com> 0.3-3
- More suggestions from Manuel for the Fedora packaging. Adding license,
spec file no longer clears BUILDROOT, adding desktop file and an icon
based on a Creative Commons image from veintecerodos' on flickr, adding
crossplatform build patch from
http://www.entheos-technologies.com/Home/moto4lin/moto4lin.html
* Sun Feb 04 2007 Sean Reifschneider <jafo at tummy.com> 0.3-2
- Changes suggested by Manuel Wolfshant: Fix SMP built flags, qmake
build dependency, and buildroot.
* Sat Feb 03 2007 Scott Kleihege <scott-rpm at tummy.com> 0.3-0.FC6
- initial version
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moto4lin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 20 Feb 2007 00:26:34 -0000 1.1
+++ .cvsignore 21 Feb 2007 05:46:56 -0000 1.2
@@ -0,0 +1 @@
+moto4lin-0.3.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moto4lin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 20 Feb 2007 00:26:34 -0000 1.1
+++ sources 21 Feb 2007 05:46:56 -0000 1.2
@@ -0,0 +1 @@
+f9e5edbc08a45ac98679e4d34d5e3574 moto4lin-0.3.tar.bz2
More information about the scm-commits
mailing list