Date: Mon, 6 Nov 2000 15:29:19 -0800 (PST) From: mheffner@vt.edu To: freebsd-gnats-submit@FreeBSD.org Subject: ports/22653: [PATCH] devel/amulet doesn't compile Message-ID: <20001106232919.31D5737B4CF@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 22653 >Category: ports >Synopsis: [PATCH] devel/amulet doesn't compile >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Mon Nov 06 15:30:00 PST 2000 >Closed-Date: >Last-Modified: >Originator: Mike Heffner >Release: 5-current >Organization: >Environment: FreeBSD 5.0-CURRENT #0: Thu Nov 2 18:21:33 EST 2000 i386 >Description: The port devel/amulet does not compile in many places. Patches were originally sent to the maintainer, but the address bounces. >How-To-Repeat: Try building the devel/amulet port. >Fix: apply patches: (also available from: http://my.ispchannel.com/~mheffner/patches/amulet.tar.gz) diff -X /tmp/xclude -ur /home/spock/stuff/amulet/include/amulet/gemM.h /usr/ports/devel/amulet/work/amulet/include/amulet/gemM.h --- /home/spock/stuff/amulet/include/amulet/gemM.h Tue Jun 10 17:01:40 1997 +++ /usr/ports/devel/amulet/work/amulet/include/amulet/gemM.h Mon Nov 6 02:35:48 2000 @@ -524,7 +524,7 @@ Am_Point_Array_Data (int size); ~Am_Point_Array_Data (); - operator== (Am_Point_Array_Data&) + bool operator== (Am_Point_Array_Data&) { return false; } protected: @@ -584,7 +584,7 @@ Am_Time_Data(Am_Time_Data* other) { time.tv_usec = other->time.tv_usec; time.tv_sec = other->time.tv_sec; } timeval time; - operator== (Am_Time_Data& other) + bool operator== (Am_Time_Data& other) { return time.tv_usec == other.time.tv_usec && time.tv_sec == other.time.tv_sec; } void Print (ostream& out) const; diff -X /tmp/xclude -ur /home/spock/stuff/amulet/include/amulet/gemX.h /usr/ports/devel/amulet/work/amulet/include/amulet/gemX.h --- /home/spock/stuff/amulet/include/amulet/gemX.h Tue Jun 24 13:30:31 1997 +++ /usr/ports/devel/amulet/work/amulet/include/amulet/gemX.h Mon Nov 6 02:24:17 2000 @@ -576,7 +576,7 @@ ~Am_Font_Data (); - operator== (Am_Font_Data&) + bool operator== (Am_Font_Data&) { return false; } void Add_Font (Display*, XFontStruct*); @@ -656,7 +656,7 @@ bool Get_Cursor (Display*, Cursor&); // I think I need this for a wrapper class - operator== (Am_Cursor_Data&) + bool operator== (Am_Cursor_Data&) { return false; } Display* main_display; @@ -724,7 +724,7 @@ ~Am_Image_Array_Data (); - operator== (Am_Image_Array_Data&) + bool operator== (Am_Image_Array_Data&) { return false; } Pixmap Get_X_Pixmap (const Am_Drawonable_Impl* draw); @@ -823,7 +823,7 @@ Am_Style_Data (); ~Am_Style_Data (); - operator== (Am_Style_Data&) + bool operator== (Am_Style_Data&) { return false; } void Add_Color_Index (Display*, XColor); @@ -883,7 +883,7 @@ Am_Point_Array_Data (int size); ~Am_Point_Array_Data (); - operator== (Am_Point_Array_Data&) + bool operator== (Am_Point_Array_Data&) { return false; } protected: diff -X /tmp/xclude -ur /home/spock/stuff/amulet/include/amulet/object_advanced.h /usr/ports/devel/amulet/work/amulet/include/amulet/object_advanced.h --- /home/spock/stuff/amulet/include/amulet/object_advanced.h Sun Dec 15 12:15:48 1996 +++ /usr/ports/devel/amulet/work/amulet/include/amulet/object_advanced.h Mon Nov 6 01:43:35 2000 @@ -252,9 +252,9 @@ Am_Slot (Am_Slot_Data* in_data) { data = in_data; } - operator== (const Am_Slot& test) const + bool operator== (const Am_Slot& test) const { return data == test.data; } - operator!= (const Am_Slot& test) const + bool operator!= (const Am_Slot& test) const { return data != test.data; } operator Am_Slot_Data* () const { return data; } diff -X /tmp/xclude -ur /home/spock/stuff/amulet/include/amulet/rich_text.h /usr/ports/devel/amulet/work/amulet/include/amulet/rich_text.h --- /home/spock/stuff/amulet/include/amulet/rich_text.h Wed May 7 14:02:24 1997 +++ /usr/ports/devel/amulet/work/amulet/include/amulet/rich_text.h Mon Nov 6 01:37:37 2000 @@ -169,7 +169,7 @@ inline Am_Text_Fragment* Get_Fragment_At( const Am_Text_Index inIndex ) const; - inline Move_Cursor( Am_Cursor& inCursor, Am_Cursor_Move inMove ) const; + // inline Move_Cursor( Am_Cursor& inCursor, Am_Cursor_Move inMove ) const; }; /****************************************************************************** @@ -770,8 +770,8 @@ * Am_Text_Fragment */ -const kFragStrSize = 1024; -const kMinFragBreak = kFragStrSize / 2; +const unsigned int kFragStrSize = 1024; +const unsigned int kMinFragBreak = kFragStrSize / 2; class Am_Text_Fragment { diff -X /tmp/xclude -ur /home/spock/stuff/amulet/include/amulet/widgets_advanced.h /usr/ports/devel/amulet/work/amulet/include/amulet/widgets_advanced.h --- /home/spock/stuff/amulet/include/amulet/widgets_advanced.h Mon Jul 21 09:49:07 1997 +++ /usr/ports/devel/amulet/work/amulet/include/amulet/widgets_advanced.h Mon Nov 6 01:44:16 2000 @@ -51,7 +51,7 @@ } Computed_Colors_Record_Data (const Am_Style& foreground); Computed_Colors_Record_Data (Computed_Colors_Record_Data*); - operator== (Computed_Colors_Record_Data&) + bool operator== (Computed_Colors_Record_Data&) { return false; } // destructor virtual ~Computed_Colors_Record_Data (); Only in /usr/ports/devel/amulet/work/amulet/lib: libamulet-release.a Only in /usr/ports/devel/amulet/work/amulet/lib: libamulet-release.so Only in /usr/ports/devel/amulet/work/amulet/lib: libamulet-release.so.3 Only in /usr/ports/devel/amulet/work/amulet/lib: libamulet.so Only in /usr/ports/devel/amulet/work/amulet/lib: libamulet.so.3 diff -X /tmp/xclude -ur /home/spock/stuff/amulet/src/anim/testanimators.cc /usr/ports/devel/amulet/work/amulet/src/anim/testanimators.cc --- /home/spock/stuff/amulet/src/anim/testanimators.cc Mon May 5 13:25:23 1997 +++ /usr/ports/devel/amulet/work/amulet/src/anim/testanimators.cc Mon Nov 6 13:19:43 2000 @@ -278,7 +278,7 @@ else if (c == 'r') Mover.Set (Am_VISIBLE, !(bool)Mover.Get(Am_VISIBLE)); else if (c == 'i') { - static debugging = false; + static bool debugging = false; if (!debugging) Am_Set_Inter_Trace(Am_INTER_TRACE_ALL); else Am_Set_Inter_Trace(Am_INTER_TRACE_NONE); debugging = !debugging; diff -X /tmp/xclude -ur /home/spock/stuff/amulet/src/debug/inspector.cc /usr/ports/devel/amulet/work/amulet/src/debug/inspector.cc --- /home/spock/stuff/amulet/src/debug/inspector.cc Mon Jul 21 05:50:20 1997 +++ /usr/ports/devel/amulet/work/amulet/src/debug/inspector.cc Mon Nov 6 03:02:04 2000 @@ -3311,7 +3311,7 @@ Am_Set_Reason reason) { #ifdef DEBUG - static flag = 0; + static int flag = 0; if (flag) return; // prevent recursive call. // We have a single global variable controlling refresh of all inspector // windows. Without this, we'd still need to do a list traverse below, diff -X /tmp/xclude -ur /home/spock/stuff/amulet/src/gem/gemW_cursor.h /usr/ports/devel/amulet/work/amulet/src/gem/gemW_cursor.h --- /home/spock/stuff/amulet/src/gem/gemW_cursor.h Wed Oct 9 19:58:10 1996 +++ /usr/ports/devel/amulet/work/amulet/src/gem/gemW_cursor.h Mon Nov 6 02:36:46 2000 @@ -15,7 +15,7 @@ Am_Cursor_Data (Am_Image_Array image, Am_Image_Array mask); virtual ~Am_Cursor_Data (); - operator== (Am_Cursor_Data&) + bool operator== (Am_Cursor_Data&) { return false; } public: diff -X /tmp/xclude -ur /home/spock/stuff/amulet/src/gem/gemW_image.h /usr/ports/devel/amulet/work/amulet/src/gem/gemW_image.h --- /home/spock/stuff/amulet/src/gem/gemW_image.h Tue Jan 28 12:20:49 1997 +++ /usr/ports/devel/amulet/work/amulet/src/gem/gemW_image.h Mon Nov 6 02:37:05 2000 @@ -28,7 +28,7 @@ Am_Image_Array_Data (Am_Image_Array_Data* proto, int width, int height); virtual ~Am_Image_Array_Data(); - operator== (Am_Image_Array_Data&) + bool operator== (Am_Image_Array_Data&) { return false; } public: diff -X /tmp/xclude -ur /home/spock/stuff/amulet/src/gem/gemW_points.h /usr/ports/devel/amulet/work/amulet/src/gem/gemW_points.h --- /home/spock/stuff/amulet/src/gem/gemW_points.h Tue Dec 17 13:36:36 1996 +++ /usr/ports/devel/amulet/work/amulet/src/gem/gemW_points.h Mon Nov 6 02:37:21 2000 @@ -30,7 +30,7 @@ Am_Point_Array_Data (int size); ~Am_Point_Array_Data (); - operator== (Am_Point_Array_Data&) + bool operator== (Am_Point_Array_Data&) { return false; } protected: diff -X /tmp/xclude -ur /home/spock/stuff/amulet/src/gem/gemW_styles.h /usr/ports/devel/amulet/work/amulet/src/gem/gemW_styles.h --- /home/spock/stuff/amulet/src/gem/gemW_styles.h Tue May 20 05:25:51 1997 +++ /usr/ports/devel/amulet/work/amulet/src/gem/gemW_styles.h Mon Nov 6 02:37:45 2000 @@ -35,7 +35,7 @@ virtual ~Am_Style_Data (); - operator== (Am_Style_Data&) + bool operator== (Am_Style_Data&) { return false; } virtual const char *Get_Color_Name (); diff -X /tmp/xclude -ur /home/spock/stuff/amulet/src/gem/gemW_text.h /usr/ports/devel/amulet/work/amulet/src/gem/gemW_text.h --- /home/spock/stuff/amulet/src/gem/gemW_text.h Mon Jan 13 05:59:01 1997 +++ /usr/ports/devel/amulet/work/amulet/src/gem/gemW_text.h Mon Nov 6 02:38:13 2000 @@ -20,7 +20,7 @@ ~Am_Font_Data (); public: - operator== (Am_Font_Data&) + bool operator== (Am_Font_Data&) { return false; } HFONT WinFont (HDC hdc); diff -X /tmp/xclude -ur /home/spock/stuff/amulet/src/gem/gemW_time.h /usr/ports/devel/amulet/work/amulet/src/gem/gemW_time.h --- /home/spock/stuff/amulet/src/gem/gemW_time.h Mon Jan 13 05:59:03 1997 +++ /usr/ports/devel/amulet/work/amulet/src/gem/gemW_time.h Mon Nov 6 02:39:22 2000 @@ -17,7 +17,7 @@ Am_Time_Data(Am_Time_Data* other) { time = other->time; } unsigned long time; - operator== (Am_Time_Data& other) + bool operator== (Am_Time_Data& other) { return time == other.time; } }; diff -X /tmp/xclude -ur /home/spock/stuff/amulet/src/gem/gemX_draw.cc /usr/ports/devel/amulet/work/amulet/src/gem/gemX_draw.cc --- /home/spock/stuff/amulet/src/gem/gemX_draw.cc Tue Aug 5 09:11:19 1997 +++ /usr/ports/devel/amulet/work/amulet/src/gem/gemX_draw.cc Mon Nov 6 02:48:26 2000 @@ -892,7 +892,7 @@ // if we have a match, do no work. if (XAllocColor(screen->display, screen->colormap, &c)) return; - static flag = 0; + static int flag = 0; if (!flag) { cerr << "** No color cells left; using closest match.\n"; flag = 1; diff -X /tmp/xclude -ur /home/spock/stuff/amulet/src/gem/gemX_time.h /usr/ports/devel/amulet/work/amulet/src/gem/gemX_time.h --- /home/spock/stuff/amulet/src/gem/gemX_time.h Mon Jan 13 05:59:09 1997 +++ /usr/ports/devel/amulet/work/amulet/src/gem/gemX_time.h Mon Nov 6 02:33:11 2000 @@ -19,7 +19,7 @@ Am_Time_Data(Am_Time_Data* other) { time.tv_usec = other->time.tv_usec; time.tv_sec = other->time.tv_sec; } timeval time; - operator== (Am_Time_Data& other) + bool operator== (Am_Time_Data& other) { return time.tv_usec == other.time.tv_usec && time.tv_sec == other.time.tv_sec; } }; diff -X /tmp/xclude -ur /home/spock/stuff/amulet/src/gem/gem_points.cc /usr/ports/devel/amulet/work/amulet/src/gem/gem_points.cc --- /home/spock/stuff/amulet/src/gem/gem_points.cc Fri Feb 21 07:12:54 1997 +++ /usr/ports/devel/amulet/work/amulet/src/gem/gem_points.cc Mon Nov 6 02:16:39 2000 @@ -41,7 +41,7 @@ Am_Point_List_Data (int *ar, int size); Am_Point_List_Data (float *ar, int size); ~Am_Point_List_Data (); - operator== (const Am_Point_List_Data&) const + bool operator== (const Am_Point_List_Data&) const { return false; } void Add (float x, float y, Am_Add_Position position); void Insert (float x, float y, Am_Point_Item* current, diff -X /tmp/xclude -ur /home/spock/stuff/amulet/src/gesture/gest_classifier.cc /usr/ports/devel/amulet/work/amulet/src/gesture/gest_classifier.cc --- /home/spock/stuff/amulet/src/gesture/gest_classifier.cc Mon Jan 13 05:59:17 1997 +++ /usr/ports/devel/amulet/work/amulet/src/gesture/gest_classifier.cc Mon Nov 6 01:58:39 2000 @@ -351,7 +351,7 @@ static double MahalanobisDistance(register Vector v, register Vector u, register Matrix sigma) { - register i; + register int i; static Vector space; double result; diff -X /tmp/xclude -ur /home/spock/stuff/amulet/src/gesture/gest_impl.h /usr/ports/devel/amulet/work/amulet/src/gesture/gest_impl.h --- /home/spock/stuff/amulet/src/gesture/gest_impl.h Mon Jan 13 05:59:19 1997 +++ /usr/ports/devel/amulet/work/amulet/src/gesture/gest_impl.h Mon Nov 6 01:54:08 2000 @@ -78,7 +78,7 @@ ~Am_Feature_Vector_Data (); - operator== (Am_Feature_Vector_Data&) + bool operator== (Am_Feature_Vector_Data&) { return false; } void Add_Point (int x, int y); @@ -139,7 +139,7 @@ ~Am_Gesture_Classifier_Data (); - operator== (Am_Gesture_Classifier_Data&) + bool operator== (Am_Gesture_Classifier_Data&) { return false; } Am_String Classify (Am_Feature_Vector fv, double *nap = 0, double *dist = 0); @@ -182,7 +182,7 @@ ~Am_Gesture_Trainer_Data (); - operator== (Am_Gesture_Trainer_Data&) + bool operator== (Am_Gesture_Trainer_Data&) { return false; } struct Gesture_Class { diff -X /tmp/xclude -ur /home/spock/stuff/amulet/src/gesture/gest_matrix.cc /usr/ports/devel/amulet/work/amulet/src/gesture/gest_matrix.cc --- /home/spock/stuff/amulet/src/gesture/gest_matrix.cc Sun Dec 15 12:18:01 1996 +++ /usr/ports/devel/amulet/work/amulet/src/gesture/gest_matrix.cc Mon Nov 6 02:11:01 2000 @@ -159,14 +159,14 @@ void ZeroVector(Vector v) { - register i; + register int i; for(i = 0; i < NROWS(v); i++) v[i] = 0.0; } void ZeroMatrix(Matrix m) { - register i, j; + register int i, j; for(i = 0; i < NROWS(m); i++) for(j = 0; j < NCOLS(m); j++) m[i][j] = 0.0; @@ -175,7 +175,7 @@ void FillMatrix(Matrix m, double fill) { - register i, j; + register int i, j; for(i = 0; i < NROWS(m); i++) for(j = 0; j < NCOLS(m); j++) m[i][j] = fill; @@ -197,7 +197,7 @@ void MatrixMultiply(register Matrix m1, register Matrix m2, register Matrix prod) { - register i, j, k; + register int i, j, k; double sum; if(NCOLS(m1) != NROWS(m2)) @@ -279,7 +279,7 @@ double QuadraticForm(register Vector v, register Matrix m) { - register i, j, n; + register int i, j, n; double result = 0; n = NROWS(v); @@ -327,7 +327,7 @@ double InvertMatrix(Matrix ym, Matrix rm) { - register i, j, k; + register int i, j, k; double det, biga, recip_biga, hold; int l[PERMBUFSIZE], m[PERMBUFSIZE]; register int n; @@ -519,7 +519,7 @@ Matrix SliceMatrix(Matrix m, unsigned rowmask, unsigned colmask) { - register i, ri, j, rj; + register int i, ri, j, rj; Matrix r; @@ -540,7 +540,7 @@ DeSliceMatrix(Matrix m, double fill, unsigned rowmask, unsigned colmask, Matrix r) { - register i, ri, j, rj; + register int i, ri, j, rj; FillMatrix(r, fill); diff -X /tmp/xclude -ur /home/spock/stuff/amulet/src/inter/inter_move_grow.cc /usr/ports/devel/amulet/work/amulet/src/inter/inter_move_grow.cc --- /home/spock/stuff/amulet/src/inter/inter_move_grow.cc Thu Mar 13 15:05:14 1997 +++ /usr/ports/devel/amulet/work/amulet/src/inter/inter_move_grow.cc Mon Nov 6 01:47:33 2000 @@ -48,7 +48,7 @@ void Print (ostream& out) const; // to print out the contents Am_Inter_Location_Data (Am_Inter_Location_Data* proto); //required by wrapper - operator== (Am_Inter_Location_Data& test_data) //required by wrapper + bool operator== (Am_Inter_Location_Data& test_data) //required by wrapper { return (ref_obj == test_data.ref_obj) && (as_line == test_data.as_line) && diff -X /tmp/xclude -ur /home/spock/stuff/amulet/src/object/impl.h /usr/ports/devel/amulet/work/amulet/src/object/impl.h --- /home/spock/stuff/amulet/src/object/impl.h Thu Apr 10 09:32:34 1997 +++ /usr/ports/devel/amulet/work/amulet/src/object/impl.h Mon Nov 6 02:40:10 2000 @@ -259,7 +259,7 @@ Am_Object_Data (const char* schema_name, Am_Object_Data* in_prototype); ~Am_Object_Data (); - operator== (Am_Object_Data&) + bool operator== (Am_Object_Data&) { return false; } Am_Object_Data* create_object (const char* new_name); diff -X /tmp/xclude -ur /home/spock/stuff/amulet/src/object/testobject.cc /usr/ports/devel/amulet/work/amulet/src/object/testobject.cc --- /home/spock/stuff/amulet/src/object/testobject.cc Wed Jul 2 12:45:20 1997 +++ /usr/ports/devel/amulet/work/amulet/src/object/testobject.cc Mon Nov 6 02:40:40 2000 @@ -610,7 +610,7 @@ { store = in_store; } int Get () { return store; } - operator== (Am_Foo_Data& test_value) + bool operator== (Am_Foo_Data& test_value) { return test_value.store == store; } private: int store; diff -X /tmp/xclude -ur /home/spock/stuff/amulet/src/opal/text_fns.cc /usr/ports/devel/amulet/work/amulet/src/opal/text_fns.cc --- /home/spock/stuff/amulet/src/opal/text_fns.cc Tue Mar 4 19:06:09 1997 +++ /usr/ports/devel/amulet/work/amulet/src/opal/text_fns.cc Mon Nov 6 01:45:45 2000 @@ -714,7 +714,7 @@ #endif void Remove (Am_Input_Char ic); Am_Text_Edit_Operation* Translate (Am_Input_Char ic) const; - operator== (Am_Edit_Translation_Table_Data& test_value) const + bool operator== (Am_Edit_Translation_Table_Data& test_value) const { return this == &test_value; } protected: >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20001106232919.31D5737B4CF>